branch master updated: * tp/texi2any.pl (_get_converter_default): use existing variable name. * tp/Texinfo/Common.pm (%default_converter_command_line_options): reindent.

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 3400744  * tp/texi2any.pl (_get_converter_default): use existing 
variable name. * tp/Texinfo/Common.pm 
(%default_converter_command_line_options): reindent.
3400744 is described below

commit 3400744629408ce09dddee9d2a2aaa0f892adeb3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Oct 11 19:14:00 2021 +0200

    * tp/texi2any.pl (_get_converter_default): use existing variable name.
    * tp/Texinfo/Common.pm (%default_converter_command_line_options):
    reindent.
---
 ChangeLog            |  6 ++++++
 tp/Texinfo/Common.pm | 20 ++++++++++++--------
 tp/texi2any.pl       |  4 ++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fe811d..4d033a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2021-10-11  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/texi2any.pl (_get_converter_default): use existing variable name.
+       * tp/Texinfo/Common.pm (%default_converter_command_line_options):
+       reindent.
+
+2021-10-11  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Config.pm (GNUT_set_from_cmdline): avoid function
        name in warning message. Gavin report.
 
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index ff8e409..fbb70c9 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -185,20 +185,24 @@ our %default_converter_command_line_options = (
   # only in HTML
   'TRANSLITERATE_FILE_NAMES' => 1,   # --transliterate-file-names
   'SPLIT'                => undef,   # --split
-  'HEADERS'              => 1,       # --headers.  Used to set diverse 
customization options
-                                     # in main program.  Only directly used in 
HTML converter
+  'HEADERS'              => 1,       # --headers.  Used to set diverse
+                                     # customization options in main program.
+                                     # Only directly used in HTML converter
   'NODE_FILES'           => undef,   # --node-files.  Depend on SPLIT
   'VERBOSE'              => undef,   # --verbose
   'OUTFILE'              => undef,   # --output    If non split and not ending 
by /.
                                      # Setting can be format dependent
   'SUBDIR'               => undef,   # --output    If split or ending by /.
                                      # Setting can be format dependent
-  'ENABLE_ENCODING'      => undef,   # --disable-encoding/--enable-encoding.  
The documentation
-                                     # only mentions Info and plain text, but 
the option is used
-                                     # in many formats, with differing 
defaults.  The default expected
-                                     # by the converters is to be unset, 
although for Info and
-                                     # plain text, default is set.  If set, it 
is set in the formats
-                                     # converter defaults.
+  'ENABLE_ENCODING'      => undef,   # --disable-encoding/--enable-encoding.
+                                     # The documentation only mentions Info and
+                                     # plain text, but the option is used
+                                     # in many formats, with differing 
defaults.
+                                     # The default expected by the converters
+                                     # is to be unset, although for Info and
+                                     # plain text, default is set.  If set,
+                                     # it is set in the formats converter
+                                     # defaults.
 );
 
 # used in main program, defaults documented in manual
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 3dda708..fa7cc7a 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -593,8 +593,8 @@ sub handle_errors($$$)
 sub _get_converter_default($)
 {
   my $option = shift;
-  if 
(defined($Texinfo::Common::documented_converter_default_command_line{$option})) 
{
-    return 
$Texinfo::Common::documented_converter_default_command_line{$option};
+  if 
(defined($Texinfo::Common::default_converter_command_line_options{$option})) {
+    return $Texinfo::Common::default_converter_command_line_options{$option};
   } elsif 
(defined($Texinfo::Common::document_settable_multiple_at_commands{$option})) {
     return $Texinfo::Common::document_settable_multiple_at_commands{$option};
   } #elsif 
(defined(%Texinfo::Common::document_settable_unique_at_commands{$option})) {