Update manpages.

6 files changed, 66 insertions, 28 deletions

diff --git a/docs/man/mudraw.1 b/docs/man/mudraw.1
index 172ec45f..9d08b99f 100644
--- a/docs/man/mudraw.1
+++ b/docs/man/mudraw.1
@@ -33,6 +33,7 @@ Use the specified password if the file is encrypted.
 .B \-o output
 The output format is inferred from the output file name.
 Embed %d in the name to indicate the page number (for example: "page%d.png").
+Printf modifiers are supported, for example "%03d".
 If no output is specified, the output will go to stdout.
 .TP
 .B \-F format
@@ -86,7 +87,7 @@ the amount of memory used.
 Ignore errors.
 .TP
 .B pages
-Comma separated list of ranges and individual page numbers (for example: 1,5,10-15).
+Comma separated list of page numbers and ranges (for example: 1,5,10-15).
 If no pages are specified, then all pages will be rendered.
 
 .SH SEE ALSO
diff --git a/docs/man/mutool.1 b/docs/man/mutool.1
index 164b33db..cb276978 100644
--- a/docs/man/mutool.1
+++ b/docs/man/mutool.1
@@ -33,6 +33,9 @@ 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 \-s
+Rewrite content streams.
+.TP
 .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.
@@ -42,7 +45,7 @@ Linearize output. Create a "Web Optimized" output file.
 .TP
 .B \-i
 Toggle decompression of image streams. Use in conjunction with -d to leave
-image- compressed.
+images compressed.
 .TP
 .B \-f
 Toggle decompression of font streams. Use in conjunction with -d to leave
@@ -54,7 +57,7 @@ ensure that although the images and/or fonts are compressed, the resulting
 file can still be viewed and edited with a text editor.
 .TP
 .B pages
-Comma separated list of page ranges to include.
+Comma separated list of page numbers and ranges to include.
 
 .SH EXTRACT
 mutool extract [options] file.pdf [object numbers]
@@ -70,7 +73,35 @@ Use the specified password if the file is encrypted.
 Convert images to RGB when extracting them.
 
 .SH INFO
-TODO
+mutool info [options] file.pdf [pages]
+.PP
+The info command lists the resources used on each page in a PDF file.
+The default is to list all resource types, but if one
+or more flags are given, only the flagged types will be shown.
+.TP
+.B \-p password
+Use the specified password if the file is encrypted.
+.TP
+.B -F
+List fonts.
+.TP
+.B -I
+List images.
+.TP
+.B -M
+List page dimensions.
+.TP
+.B -S
+List shadings.
+.TP
+.B -P
+List patterns.
+.TP
+.B -X
+List form and postscript XObjects.
+.TP
+.B pages
+Comma separated list of page numbers and ranges to include.
 
 .SH POSTER
 mutool poster [options] input.pdf [output.pdf]
@@ -96,14 +127,17 @@ The show command will print the specified objects and streams to stdout.
 Streams are decoded and non-printable characters are represented
 with a period by default.
 .TP
+.B \-p password
+Use the specified password if the file is encrypted.
+.TP
+.B \-o file
+Write output to file instead of stdout.
+.TP
 .B \-b
 Print streams as binary data and omit the object header.
 .TP
 .B \-e
 Print streams in their original encoded (or compressed) form.
-.TP
-.B \-p password
-Use the specified password if the file is encrypted.
 .PP
 Specify objects by number, or use one of the following special names:
 .TP
diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c
index 60d4223b..8edcf381 100644
--- a/source/tools/mudraw.c
+++ b/source/tools/mudraw.c
@@ -182,7 +182,7 @@ static void usage(void)
 		"\t-D\tdisable use of display list\n"
 		"\t-i\tignore errors\n"
 		"\n"
-		"\tpages\tcomma separated list of page ranges\n"
+		"\tpages\tcomma separated list of page numbers and ranges\n"
 		);
 	exit(1);
 }
diff --git a/source/tools/pdfclean.c b/source/tools/pdfclean.c
index cbb14f16..2ad0c7e6 100644
--- a/source/tools/pdfclean.c
+++ b/source/tools/pdfclean.c
@@ -31,7 +31,8 @@ static void usage(void)
 		"\t-i\ttoggle decompression of image streams\n"
 		"\t-f\ttoggle decompression of font streams\n"
 		"\t-a\tascii hex encode binary streams\n"
-		"\tpages\tcomma separated list of ranges\n");
+		"\tpages\tcomma separated list of page numbers and ranges\n"
+		);
 	exit(1);
 }
 
diff --git a/source/tools/pdfinfo.c b/source/tools/pdfinfo.c
index 660c015e..a3a7ba24 100644
--- a/source/tools/pdfinfo.c
+++ b/source/tools/pdfinfo.c
@@ -152,14 +152,16 @@ static void
 infousage(void)
 {
 	fprintf(stderr,
-		"usage: mutool info [options] [file.pdf ... ]\n"
-		"\t-d -\tpassword for decryption\n"
-		"\t-f\tlist fonts\n"
-		"\t-i\tlist images\n"
-		"\t-m\tlist dimensions\n"
-		"\t-p\tlist patterns\n"
-		"\t-s\tlist shadings\n"
-		"\t-x\tlist form and postscript xobjects\n");
+		"usage: mutool info [options] file.pdf [pages]\n"
+		"\t-p -\tpassword for decryption\n"
+		"\t-F\tlist fonts\n"
+		"\t-I\tlist images\n"
+		"\t-M\tlist dimensions\n"
+		"\t-P\tlist patterns\n"
+		"\t-S\tlist shadings\n"
+		"\t-X\tlist form and postscript xobjects\n"
+		"\tpages\tcomma separated list of page numbers and ranges\n"
+		);
 	exit(1);
 }
 
@@ -1032,17 +1034,17 @@ int pdfinfo_main(int argc, char **argv)
 	int ret;
 	fz_context *ctx;
 
-	while ((c = fz_getopt(argc, argv, "mfispxd:")) != -1)
+	while ((c = fz_getopt(argc, argv, "FISPXMp:")) != -1)
 	{
 		switch (c)
 		{
-		case 'm': if (show == ALL) show = DIMENSIONS; else show |= DIMENSIONS; break;
-		case 'f': if (show == ALL) show = FONTS; else show |= FONTS; break;
-		case 'i': if (show == ALL) show = IMAGES; else show |= IMAGES; break;
-		case 's': if (show == ALL) show = SHADINGS; else show |= SHADINGS; break;
-		case 'p': if (show == ALL) show = PATTERNS; else show |= PATTERNS; break;
-		case 'x': if (show == ALL) show = XOBJS; else show |= XOBJS; break;
-		case 'd': password = fz_optarg; break;
+		case 'F': if (show == ALL) show = FONTS; else show |= FONTS; break;
+		case 'I': if (show == ALL) show = IMAGES; else show |= IMAGES; break;
+		case 'S': if (show == ALL) show = SHADINGS; else show |= SHADINGS; break;
+		case 'P': if (show == ALL) show = PATTERNS; else show |= PATTERNS; break;
+		case 'X': if (show == ALL) show = XOBJS; else show |= XOBJS; break;
+		case 'M': if (show == ALL) show = DIMENSIONS; else show |= DIMENSIONS; break;
+		case 'p': password = fz_optarg; break;
 		default:
 			infousage();
 			break;
diff --git a/source/tools/pdfshow.c b/source/tools/pdfshow.c
index 10ed4405..b3ce036f 100644
--- a/source/tools/pdfshow.c
+++ b/source/tools/pdfshow.c
@@ -15,10 +15,10 @@ static int showcolumn;
 static void usage(void)
 {
 	fprintf(stderr, "usage: mutool show [options] file.pdf [grep] [xref] [trailer] [pages] [outline] [object numbers]\n");
+	fprintf(stderr, "\t-p -\tpassword\n");
+	fprintf(stderr, "\t-o -\toutput file\n");
 	fprintf(stderr, "\t-b\tprint streams as binary data\n");
 	fprintf(stderr, "\t-e\tprint encoded streams (don't decode)\n");
-	fprintf(stderr, "\t-p\tpassword\n");
-	fprintf(stderr, "\t-o\toutput file\n");
 	exit(1);
 }
 
@@ -224,9 +224,9 @@ int pdfshow_main(int argc, char **argv)
 		switch (c)
 		{
 		case 'p': password = fz_optarg; break;
+		case 'o': output = fz_optarg; break;
 		case 'b': showbinary = 1; break;
 		case 'e': showdecode = 0; break;
-		case 'o': output = fz_optarg; break;
 		default: usage(); break;
 		}
 	}