Add long output option parsing.

Use comma-separated list of flags and key/value pairs, for
example: "linearize,resolution=72,colorspace=gray"

4 files changed, 16 insertions, 7 deletions

diff --git a/source/tools/muconvert.c b/source/tools/muconvert.c
index 5e72b5d3..18bbd46b 100644
--- a/source/tools/muconvert.c
+++ b/source/tools/muconvert.c
@@ -37,10 +37,12 @@ static void usage(void)
 		"\t-o -\toutput file name (%%d for page number)\n"
 		"\t-F -\toutput format (default inferred from output file name)\n"
 		"\t\tcbz, pdf\n"
-		"\t-O -\toutput format options\n"
+		"\t-O -\tcomma separated list of options for output format\n"
 		"\n"
 		"\tpages\tcomma separated list of page numbers and ranges\n"
+		"\n"
 		);
+	fprintf(stderr, "%s\n", fz_cbz_write_options_usage);
 	exit(1);
 }
 
diff --git a/source/tools/murun.c b/source/tools/murun.c
index 6d9881a2..9b52558f 100644
--- a/source/tools/murun.c
+++ b/source/tools/murun.c
@@ -2511,7 +2511,7 @@ static void ffi_PDFDocument_save(js_State *J)
 	fz_context *ctx = js_getcontext(J);
 	pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
 	const char *filename = js_tostring(J, 1);
-	const char *options = js_isdefined(J, 2) ? js_tostring(J, 2) : "ga";
+	const char *options = js_isdefined(J, 2) ? js_tostring(J, 2) : NULL;
 	pdf_write_options pwo;
 
 	fz_try(ctx) {
diff --git a/source/tools/pdfcreate.c b/source/tools/pdfcreate.c
index 839e493e..77f0c819 100644
--- a/source/tools/pdfcreate.c
+++ b/source/tools/pdfcreate.c
@@ -11,9 +11,15 @@ static void usage(void)
 	fprintf(stderr,
 		"usage: mutool create [-o output.pdf] [-O options] page.txt [page2.txt ...]\n"
 		"\t-o\tname of PDF file to create\n"
-		"\t-O\tPDF write options\n"
-		"\tpage.txt file defines page size, fonts, images and contents\n"
+		"\t-O\tcomma separated list of output options\n"
+		"\tpage.txt\tcontent stream with annotations for creating resources\n\n"
+		"Content stream special commands:\n"
+		"\t%%%%MediaBox LLX LLY URX URY\n"
+		"\t%%%%Rotate Angle\n"
+		"\t%%%%Font Name Filename (or base 14 font name)\n"
+		"\t%%%%Image Name Filename\n\n"
 		);
+	fprintf(stderr, "%s\n", fz_pdf_write_options_usage);
 	exit(1);
 }
 
diff --git a/source/tools/pdfmerge.c b/source/tools/pdfmerge.c
index f63a90c7..597bd4ce 100644
--- a/source/tools/pdfmerge.c
+++ b/source/tools/pdfmerge.c
@@ -11,10 +11,11 @@ static void usage(void)
 	fprintf(stderr,
 		"usage: mutool merge [-o output.pdf] [-O options] input.pdf [pages] [input2.pdf] [pages2] ...\n"
 		"\t-o\tname of PDF file to create\n"
-		"\t-O\tPDF write options\n"
-		"\tinput.pdf\tname of first PDF file from which we are copying pages\n"
-		"\tpages: comma separated list of page ranges (for example: 1-5,6,10-)\n"
+		"\t-O\tcomma separated list of output options\n"
+		"\tinput.pdf\tname of input file from which to copy pages\n"
+		"\tpages\tcomma separated list of page ranges to copy (for example: 1-5,6,10-)\n\n"
 		);
+	fprintf(stderr, "%s\n", fz_pdf_write_options_usage);
 	exit(1);
 }