Update debian package and the man pages for the command line tools.

7 files changed, 76 insertions, 91 deletions

diff --git a/apps/pdfclean.c b/apps/pdfclean.c
index f3f1e202..06877fbd 100644
--- a/apps/pdfclean.c
+++ b/apps/pdfclean.c
@@ -554,13 +554,13 @@ int main(int argc, char **argv)
 	int c, num;
 	int subset;
 
-	while ((c = fz_getopt(argc, argv, "gxp:")) != -1)
+	while ((c = fz_getopt(argc, argv, "gdp:")) != -1)
 	{
 		switch (c)
 		{
 		case 'p': password = fz_optarg; break;
 		case 'g': dogarbage ++; break;
-		case 'x': doexpand ++; break;
+		case 'd': doexpand ++; break;
 		default: usage(); break;
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index 6ef94a8b..a17e8939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,4 +3,3 @@ mupdf (0.6-1) unstable; urgency=low
   * First release of MuPDF with debian package.
 
  -- Tor Andersson <tor@ghostscript.com>  Thu, 27 May 2010 17:11:13 +0100
-
diff --git a/debian/control b/debian/control
index 6ffe6cdf..f3742703 100644
--- a/debian/control
+++ b/debian/control
@@ -30,12 +30,10 @@ Depends: ${shlibs:Depends}
 Description: Commmand line tools for the MuPDF viewer
  MuPDF is a lightweight PDF viewer and toolkit written in portable C.
  .
- This package contains command line utilities using the MuPDF library:
+ This package contains command line tools using the MuPDF library:
  .
- pdfdraw to render pages to a PNM image files.
+ pdfdraw to render pages to image files.
  .
- pdfshow to print and examine the objects in a PDF file.
+ pdfshow to examine objects in a PDF file.
  .
- pdfclean to decompress and pretty print the streams and objects
- in PDF files and also to extract individual pages.
-
+ pdfclean to decompress and pretty print streams and objects in PDF files.
diff --git a/debian/libmupdf-dev.install b/debian/libmupdf-dev.install
index e9399d62..dd3a2bda 100644
--- a/debian/libmupdf-dev.install
+++ b/debian/libmupdf-dev.install
@@ -1,7 +1,4 @@
 fitz/fitz.h usr/include
-fitz/fitz_base.h usr/include
-fitz/fitz_draw.h usr/include
-fitz/fitz_stream.h usr/include
 mupdf/mupdf.h usr/include
 debian/mupdf.pc usr/lib/pkgconfig
 debian/tmp/usr/lib/libmupdf.a
diff --git a/debian/pdfclean.1 b/debian/pdfclean.1
index 9bfe9b37..aec6f0f3 100644
--- a/debian/pdfclean.1
+++ b/debian/pdfclean.1
@@ -1,35 +1,31 @@
-.TH PDFCLEAN 1 "March 24, 2010"
+.TH PDFCLEAN 1 "July 19, 2010"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
-pdfclean \- garbage collect, decompress and pretty print a PDF file
+pdfclean \- pretty print, decompress and garbage collect PDF files
 .SH SYNOPSIS
 .B pdfclean
 .RI [ options ]
-.RI PDFfile
-.RI [ output ]
+.RI input.pdf
+.RI [ output.pdf ]
 .SH DESCRIPTION
-This manual page briefly describes the
 .B pdfclean
-command. Unless any options that modify the behaviour are specified the
-input PDF file is pretty printed and stored under the output PDF file name
-(out.pdf if no file name is given).
+pretty prints and rewrites the contents of a PDF file.
+If no output file is specified, the new file will be written to "out.pdf" in
+the current directory.
 .PP
 .SH OPTIONS
-A description of each of the supported options is included below.
 .TP
 .B \-p password
-Uses the given password during decryption of an encrypted PDF file.
-The password is tried both as user and owner password.
+Use the specified password if the file is encrypted.
 .TP
 .B \-g
-Enables garbage collection of PDF objects that have no references from
-other objects.
+Garbage collect objects that have no references from other objects.
+Give the option twice to renumber all objects and compact the cross reference table.
+Give it three times to merge and reuse duplicate objects.
 .TP
-.B \-x
-Expands compressed PDF object streams. This may make a file much larger,
-but provides easy access to all PDF object streams. Note that encrypted
-files requires the password to be set using
-.B \-p .
+.B \-d
+Decompress streams. This will make the output file larger, but provides
+easy access for reading and editing the contents with a text editor.
 .SH SEE ALSO
 .BR mupdf (1),
 .BR pdfdraw (1).
@@ -37,5 +33,3 @@ files requires the password to be set using
 .SH AUTHOR
 MuPDF was written by Tor Andersson <tor@ghostscript.com>.
 MuPDF is Copyright 2006-2010 Artifex Software, Inc.
-.PP
-This manual page was written by Sebastian Rasmussen <sebras@hotmail.com>.
diff --git a/debian/pdfdraw.1 b/debian/pdfdraw.1
index 004a2cb7..1dba4521 100644
--- a/debian/pdfdraw.1
+++ b/debian/pdfdraw.1
@@ -1,57 +1,61 @@
-.TH PDFDRAW 1 "April 15, 2010"
+.TH PDFDRAW 1 "July 19, 2010"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
-pdfdraw \- renderer tool to convert a PDF file to PNM image files
+pdfdraw \- render PDF documents
 .SH SYNOPSIS
 .B pdfdraw
 .RI [ options ]
-.RI [ PDFfile\ pages ]
+.RI [ file.pdf\ [ pages ] ]
 .B ...
 .SH DESCRIPTION
-This manual page briefly describes the
 .B pdfdraw
-command. Unless any options that modify the behaviour are specified each
-page of each PDF file is rendered and a MD5 checksum over the resulting
-pixels is computed and printed. If the
-.RI pages
-argument is missing all pages will be rendered, but it could be specified
-and in that case this controls what pages to render. The argument can be
-given as a single integer representing the page number, by a range, e.g.
-1-3, comma-separates page numbers and ranges, e.g. 1-3,5,7-9. Additionally
-the last element in the comma-separated list can be specified as an open
-range, e.g. 9-, which means that all pages in the PDF file starting from
-that page ar rendered.
-.PP
+will render a PDF document to image files.
+The supported image formats are: png, ppm, pam and png.
+Select the pages to be rendered by specifying a comma
+separated list of ranges and individual page numbers (for example: 1,5,10-15).
+In no pages are specified all the pages will be rendered.
 .SH OPTIONS
-A description of each of the supported options is included below.
 .TP
-.B \-b bands
-Each page is rendered in the given number of separate bands. The default is
-to render the entire page in one go.
+.B \-o output
+The image format is deduced from the output file name.
+Embed %d in the name to indicate the page number (for example: "page%d.png").
 .TP
 .B \-p password
-Uses the given password during decryption of an encrypted PDF file.
-The password is tried both as user and owner password.
-.TP
-.B \-o pattern
-Enables generation of PNM files, one per page. Each file is given a name
-represented by the specified pattern where %d represents the page number,
-e.g. output%03d.pnm.
+Use the specified password if the file is encrypted.
 .TP
 .B \-r resolution
-Specified the resolution when rendering each page, specified in dots per
-inch. The deafult is 72dpi.
+Render the page at the specified resolution.
+The default resolution is 72 dpi.
+.TP
+.B \-a
+Save the alpha channel.
+The default behavior is to render each page with a white background.
+With this option, the page background is transparent.
+Only supported for pam and png output formats.
+.TP
+.B \-g
+Render in grayscale.
+The default is to render a full color RGB image.
+If the output format is pgm or ppm this option is ignored.
 .TP
 .B \-m
-Enables benchmarking, causing rendering time to be printed for each page as
-well as summary statistics after all pages in each PDF file have been
-rendered.
+Show timing information.
+Take the time it takes for each page to render and print
+a summary at the end.
+.TP
+.B \-5
+Print an MD5 checksum of the rendered image data for each page.
 .TP
 .B \-t
-Print the text on the page in UTF-8.
+Print the text contents of each page in UTF-8 encoding.
+Give the option twice to print detailed information
+about the location of each character in XML format.
 .TP
 .B \-x
-Print an XML representation of the page graphics.
+Print the display list used to render each page.
+.TP
+.B \-A
+Disable the use of accelerated functions.
 .SH SEE ALSO
 .BR mupdf (1),
 .BR pdfclean (1).
@@ -59,5 +63,3 @@ Print an XML representation of the page graphics.
 .SH AUTHOR
 MuPDF was written by Tor Andersson <tor@ghostscript.com>.
 MuPDF is Copyright 2006-2010 Artifex Software, Inc.
-.PP
-This manual page was written by Sebastian Rasmussen <sebras@hotmail.com>.
diff --git a/debian/pdfshow.1 b/debian/pdfshow.1
index 3767aa61..c1865df0 100644
--- a/debian/pdfshow.1
+++ b/debian/pdfshow.1
@@ -1,44 +1,39 @@
-.TH PDFSHOW 1 "April 15, 2010"
+.TH PDFSHOW 1 "July 19, 2010"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
-pdfshow \- PDF file debugging tool used to show PDF objects
+pdfshow \- show objects and streams that make up a PDF document
 .SH SYNOPSIS
 .B pdfshow
 .RI [ options ]
-.RI PDFfile
+.RI file.pdf
 .RI [ xref ]
 .RI [ trailer ]
-.RI [ object-number ]
-.B ...
+.RI [ pages ]
+.RI [ object-number... ]
 .SH DESCRIPTION
-This manual page briefly describes the
 .B pdfshow
-command. The default action taken if only a PDF file name is given is to
-print the PDF trailer. An alternative is to specify xref as an argument,
-causing
-.B pdfshow
-to print the trailer section of the file. The most useful operation
-however is to give one or more whitespace separated integers referring to
-PDF objects, causing each to be printed.
+pretty prints the objects and streams specified on the command line.
+Streams are decoded and non-printable characters are represented
+with a period.
+Specify objects with their number.
+The special names xref, trailer and pages will
+respectively print the cross reference, trailer,
+and the object numbers for all pages.
 .PP
 .SH OPTIONS
-A description of each of the supported options is included below.
 .TP
 .B \-b
-Causes pdfshow to print all object streams as raw binary data
+Print streams as binary data and omit the object header.
 .TP
-.B \-p password
-Uses the given password during decryption of an encrypted PDF file.
-The password is tried both as user and owner password.
+.B \-e
+Print streams in their original encoded form.
 .TP
-.B \-x
-Enables decompression of object stream contents before printing them.
+.B \-p password
+Use the specified password if the file is encrypted.
 .SH SEE ALSO
 .BR mupdf (1),
 .BR pdfclean (1).
 .BR pdfdraw (1).
 .SH AUTHOR
 MuPDF was written by Tor Andersson <tor@ghostscript.com>.
-MuPDF is Copyright 2006-2010 Artifex Software, Inc.
-.PP
-This manual page was written by Sebastian Rasmussen <sebras@hotmail.com>.
+MuPDF is copyright 2006-2010 Artifex Software, Inc.