branch master updated: Fix usage message for help2man formatting

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 540d4ad  Fix usage message for help2man formatting
540d4ad is described below

commit 540d4ad001b2efb77d20d743dfff117e9a0ba801
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Dec 19 14:01:06 2021 +0000

    Fix usage message for help2man formatting
    
    * tp/texi2any.pl  Change indentation of the message for the
    -o message so that help2man treats it as a single paragraph.
    Split up part of the usage message so the text for each option
    can be translated separately.  Report from
    Dan Jacobson <jidanni@jidanni.org> and suggested fix by
    Alfred M. Szmidt <ams@gnu.org>.
---
 ChangeLog      | 11 +++++++++++
 tp/texi2any.pl | 34 +++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e4d385..8daa3b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2021-12-19  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Fix usage message for help2man formatting
+
+       * tp/texi2any.pl  Change indentation of the message for the
+       -o message so that help2man treats it as a single paragraph.
+       Split up part of the usage message so the text for each option
+       can be translated separately.  Report from
+       Dan Jacobson <jidanni@jidanni.org> and suggested fix by
+       Alfred M. Szmidt <ams@gnu.org>.
+
 2021-12-19  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line)
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index bfec6f5..3be31c9 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -658,26 +658,30 @@ the behavior is identical, and does not depend on the 
installed name.\n")
       --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,
                                 after checking validity of TEXINFO-FILE.\n")
 ."\n";
-  # TODO: avoid \n in translated strings, split each option in a translatable
-  # string.  Report from Benno Schulenberg
-  $makeinfo_help .= __("General output options:
-  -E, --macro-expand=FILE     output macro-expanded source to FILE,
-                                ignoring any \@setfilename.
-      --no-headers            suppress node separators, Node: lines, and menus
+
+  $makeinfo_help .= __("General output options:\n")
+.__(
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,
+                                ignoring any \@setfilename.\n")
+.__(
+"      --no-headers            suppress node separators, Node: lines, and menus
                                 from Info output (thus producing plain text)
                                 or from HTML (thus producing shorter output).
                                 Also, if producing Info, write to
-                                standard output by default.
-      --no-split              suppress any splitting of the output;
-                                generate only one output file.
-      --[no-]number-sections  output chapter and sectioning numbers;
-                                default is on.
-  -o, --output=DEST           output to DEST.
+                                standard output by default.\n")
+.__(
+"      --no-split              suppress any splitting of the output;
+                                generate only one output file.\n")
+.__(
+"      --[no-]number-sections  output chapter and sectioning numbers;
+                                default is on.\n")
+.__(
+"  -o, --output=DEST           output to DEST.
                                 With split output, create DEST as a directory
-                                 and put the output files there.
+                                and put the output files there.
                                 With non-split output, if DEST is already
-                                 a directory or ends with a /,
-                                 put the output file there.
+                                a directory or ends with a /,
+                                put the output file there.
                                 Otherwise, DEST names the output file.\n")
 ."\n";
   # TODO: avoid \n in translated strings, split each option in a translatable