[groff] 18/45: [grohtml,groff,nroff,troff]: Tweak usage message.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 06ae7b0b825dc9b33d8275b4d12d8943db25ec99
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Jan 16 16:39:54 2022 +1100

    [grohtml,groff,nroff,troff]: Tweak usage message.
    
    * src/devices/grohtml/post-html.cpp (usage):
    * src/roff/groff/groff.cpp (synopsis):
    * src/roff/nroff/nroff.sh:
    * src/roff/troff/input.cpp (usage): Stop putting an ellipsis inside a
      bracket expression (for file arguments); that suggests misleading
      complexity.
    
    * src/devices/grohtml/post-html.cpp (usage): Also don't set
      metasyntactic variable names in screaming capitals when they are
      separated from option letters by space and thus can't be confused with
      them.
---
 ChangeLog                         | 16 ++++++++++++++++
 src/devices/grohtml/post-html.cpp |  9 +++++----
 src/roff/groff/groff.cpp          |  2 +-
 src/roff/nroff/nroff.sh           |  2 +-
 src/roff/troff/input.cpp          |  2 +-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eb3fc839..88d79b8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2022-01-16  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [grohtml,groff,nroff,troff]: Tweak usage message.
+
+       * src/devices/grohtml/post-html.cpp (usage):
+       * src/roff/groff/groff.cpp (synopsis):
+       * src/roff/nroff/nroff.sh:
+       * src/roff/troff/input.cpp (usage): Stop putting an ellipsis
+       inside a bracket expression (for file arguments); that suggests
+       misleading complexity.
+
+       * src/devices/grohtml/post-html.cpp (usage): Also don't set
+       metasyntactic variable names in screaming capitals when they are
+       separated from option letters by space and thus can't be
+       confused with them.
+
 2022-01-15  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [libdriver]: Update diagnostic messages.
diff --git a/src/devices/grohtml/post-html.cpp 
b/src/devices/grohtml/post-html.cpp
index 830ed8d4..2e3c09de 100644
--- a/src/devices/grohtml/post-html.cpp
+++ b/src/devices/grohtml/post-html.cpp
@@ -5670,11 +5670,12 @@ int main(int argc, char **argv)
 
 static void usage(FILE *stream)
 {
-  fprintf(stream, "usage: %s [-bCGhlnrVy] [-F FONT-DIRECTORY]"
-         " [-j OUTPUT-STEM] [-s BASE-POINT-SIZE] [-S HEADING-LEVEL]"
-         " [-x HTML-DIALECT] [FILE ...]\n",
+  fprintf(stream, "usage: %s [-bCGhlnrVy] [-F font-directory]"
+         " [-j output-stem] [-s base-point-size] [-S heading-level]"
+         " [-x html-dialect] [file] ...\n",
+         program_name);
+  fprintf(stream, "usage: %s {--help | -v | --version}\n",
          program_name);
-  fprintf(stream, "usage: %s -v\n", program_name);
 }
 
 // Local Variables:
diff --git a/src/roff/groff/groff.cpp b/src/roff/groff/groff.cpp
index db7218c0..315cc0eb 100644
--- a/src/roff/groff/groff.cpp
+++ b/src/roff/groff/groff.cpp
@@ -789,7 +789,7 @@ void synopsis(FILE *stream)
 "usage: %s [-abcCeEgGijklNpRsStUVXzZ] [-dCS] [-dNAME=STRING] [-Denc]"
 " [-fFAM] [-Fdir] [-Idir] [-Kenc] [-Larg] [-mNAME] [-Mdir] [-nNUM]"
 " [-oLIST] [-Parg] [-rCN] [-rREG=EXPR] [-Tdev] [-wNAME] [-Wname]"
-" [FILE ...]\n"
+" [file] ...\n"
 "usage: %s {-h | --help | -v | --version}\n",
          program_name, program_name);
 }
diff --git a/src/roff/nroff/nroff.sh b/src/roff/nroff/nroff.sh
index 231292dd..9de77e7f 100644
--- a/src/roff/nroff/nroff.sh
+++ b/src/roff/nroff/nroff.sh
@@ -70,7 +70,7 @@ do
       cat <<EOF
 usage: $prog [-bcCEhikpRStUVz] [-dCS] [-dNAME=STRING] [-Karg] [-mNAME]\
  [-Mdir] [-nNUM] [-oLIST] [-Parg] [-rCN] [-rREG=EXPR] [-Tdev] [-wNAME]\
- [-Wname] [FILE ...]
+ [-Wname] [file] ...
 usage: $prog {--help | -v | --version}
 EOF
       exit 0 ;;
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index eaf84936..bf676051 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -7987,7 +7987,7 @@ void usage(FILE *stream, const char *prog)
   fprintf(stream,
 "usage: %s [-abcCEiRUz] [-dCS] [-dNAME=STRING] [-fFAM] [-Fdir]"
 " [-Idir] [-mNAME] [-Mdir] [-nNUM] [-oLIST] [-rCN] [-rREG=EXPR]"
-" [-Tdev] [-wNAME] [-Wname] [FILE ...]\n"
+" [-Tdev] [-wNAME] [-Wname] [file] ...\n"
 "usage: %s {-h | --help | -v | --version}\n",
          prog, prog);
 }