jbig2dec: Mention all long options in usage and manpage.

2 files changed, 28 insertions, 23 deletions

diff --git a/jbig2dec/jbig2dec.1 b/jbig2dec/jbig2dec.1
index 01f960a5e..8141fc67d 100644
--- a/jbig2dec/jbig2dec.1
+++ b/jbig2dec/jbig2dec.1
@@ -1,4 +1,4 @@
-.TH jbig2dec 1 "2020 February 11" "Version 0.18" "jbig2dec Manual"
+.TH jbig2dec 1 "2020 March 11" "Version 0.18" "jbig2dec Manual"
 
 .SH NAME
 jbig2dec \- File format converter specialized in JBIG2 decoding
@@ -32,35 +32,38 @@ argument to request the embedded parser.
 .SH OPTIONS
 The options are as follows:
 .TP
-.BI -o " file"
+.BR -e ", " --embedded
+Expect embedded bit stream without file header.
+.TP
+.BI -o " file" ", --output" " file"
 Store the decoded output in
 .IR file .
 Defaults to the input with a different extension.
 Set to \fI-\fR for standard output.
 .TP
-.BI -t " type"
+.BI -t " type" ", --format" " type"
 Force a particular output file format. Supported are \fIpng\fR and
 \fIpbm\fR.
 .TP
-.BR -d " or " --dump
+.BR -d ", " --dump
 Print the structure of the JBIG2 file rather than explicitly decoding it.
 .TP
-.BR --hash
+.BR -m ", " --hash
 Print a hash of the decoded document.
 .TP
-.BR -q " or " --quiet
+.BR -q ", " --quiet
 Suppress warnings and other diagnostic output.
 .TP
-.BR -v " or " --verbose
+.BR -v ", " --verbose
 Report additional information about the decoding process.
 Pass just \fB-v\fR for information about the file as it's being decoded.
 This is the same as \fB--verbose=2\fR.
 Pass \fB--verbose=3\fR or higher for debugging information.
 .TP
-.BR --version
+.BR -V ", " --version
 Show program version information.
 .TP
-.BR -h " or " --help
+.BR -h ", " --help
 Show usage summary.
 
 .SH REPORTING BUGS
diff --git a/jbig2dec/jbig2dec.c b/jbig2dec/jbig2dec.c
index 45691839a..6763421ad 100644
--- a/jbig2dec/jbig2dec.c
+++ b/jbig2dec/jbig2dec.c
@@ -230,22 +230,24 @@ print_usage(void)
             "  embedded streams.\n"
             "\n"
             "  available options:\n"
-            "    -h --help      this usage summary\n"
-            "    -q --quiet     suppress diagnostic output\n"
-            "    -v --verbose   set the verbosity level\n"
-            "    -d --dump      print the structure of the jbig2 file\n"
-            "                   rather than explicitly decoding\n"
-            "       --version   program name and version information\n"
-            "       --hash      print a hash of the decoded document\n"
-            "    -e --embedded  expect embedded bit stream without file header\n"
-            "    -o <file>      send decoded output to <file>\n"
-            "                   Defaults to the the input with a different\n"
-            "                   extension. Pass '-' for stdout.\n"
-            "    -t <type>      force a particular output file format\n"
+            "    -h --help       this usage summary\n"
+            "    -q --quiet      suppress diagnostic output\n"
+            "    -v --verbose    set the verbosity level\n"
+            "    -d --dump       print the structure of the jbig2 file\n"
+            "                    rather than explicitly decoding\n"
+            "    -V --version    program name and version information\n"
+            "    -m --hash       print a hash of the decoded document\n"
+            "    -e --embedded   expect embedded bit stream without file header\n"
+            "    -o <file>\n"
+            "    --output <file> send decoded output to <file>\n"
+            "                    Defaults to the the input with a different\n"
+            "                    extension. Pass '-' for stdout.\n"
+            "    -t <type>\n"
+            "    --format <type> force a particular output file format\n"
 #ifdef HAVE_LIBPNG
-            "                   supported options are 'png' and 'pbm'\n"
+            "                    supported options are 'png' and 'pbm'\n"
 #else
-            "                   the only supported option is 'pbm'\n"
+            "                    the only supported option is 'pbm'\n"
 #endif
             "\n");