branch master updated: * tp/Texinfo/Common.pm (%document_settable_at_commands) (%document_settable_multiple_at_commands): rename %document_settable_at_commands as %document_settable_multiple_at_commands.

[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 fb09260  * tp/Texinfo/Common.pm (%document_settable_at_commands) 
(%document_settable_multiple_at_commands): rename 
%document_settable_at_commands as %document_settable_multiple_at_commands.
fb09260 is described below

commit fb0926044ab18fad81eb359a9c3a04fd88b8699f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Sep 1 22:13:23 2021 +0200

    * tp/Texinfo/Common.pm (%document_settable_at_commands)
    (%document_settable_multiple_at_commands): rename
    %document_settable_at_commands as
    %document_settable_multiple_at_commands.
---
 ChangeLog                        |  7 +++++++
 tp/Texinfo/Common.pm             | 11 ++++++-----
 tp/Texinfo/Convert/IXIN.pm       |  7 +++++--
 tp/Texinfo/ParserNonXS.pm        |  2 +-
 tp/Texinfo/XS/parsetexi/api.c    |  2 +-
 tp/Texinfo/XS/parsetexi/parser.c |  2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fca22d8..581a784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2021-09-01  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Common.pm (%document_settable_at_commands)
+       (%document_settable_multiple_at_commands): rename
+       %document_settable_at_commands as
+       %document_settable_multiple_at_commands.
+
+2021-09-01  Patrice Dumas  <pertusus@free.fr>
+
        * doc/texinfo.texi (HTML Customization Variables)
        (@command{latex2html} Customization Variables, @command{texi2html})
        tp/Texinfo/Common.pm (@variable_string_settables)
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 2585fb2..9a2bcf7 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -132,7 +132,7 @@ our %default_structure_customization_values = (
 
 
 # customization options
-our %document_settable_at_commands = (
+our %document_settable_multiple_at_commands = (
   'allowcodebreaks' => 'true',
   'clickstyle' => '@arrow',
   'codequotebacktick' => 'off',
@@ -156,7 +156,8 @@ our %document_settable_at_commands = (
 # those should be unique
 our %document_settable_unique_at_commands = (
   # when passed through a configuration variable, documentdescription
-  # should be already formatted for HTML
+  # should be already formatted for HTML.  There is no default,
+  # what is determined to be the title is used if not set.
   'documentdescription' => undef,
   'evenfootingmarks' => undef,
   'evenheadingmarks' => undef,
@@ -325,9 +326,9 @@ my @variable_other_settables = (
 );
 
 my %valid_options;
-foreach my $var (keys(%document_settable_at_commands), 
+foreach my $var (keys(%document_settable_multiple_at_commands),
          keys(%document_settable_unique_at_commands),
-         @command_line_settables, @variable_string_settables, 
+         @command_line_settables, @variable_string_settables,
          @variable_other_settables) {
   $valid_options{$var} = 1;
 }
@@ -349,7 +350,7 @@ sub add_valid_option($)
 }
 
 my %customization_variable_classes = (
-  'document_settable_at_commands' => [ 
sort(keys(%document_settable_at_commands)) ],
+  'document_settable_multiple_at_commands' => [ 
sort(keys(%document_settable_multiple_at_commands)) ],
   'document_settable_unique_at_commands' => [ 
sort(keys(%document_settable_unique_at_commands)) ],
   'command_line_settables' => \@command_line_settables,
   'variable_string_settables' => \@variable_string_settables,
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index 2a3d654..1a5a25f 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -348,15 +348,17 @@ sub output_ixin($$)
   my %setting_commands;
   my %end_of_nodes_setting_commands;
   my %setting_commands_defaults;
+  # FIXME this code is unclear and probably needs to be fixed if developemnt
+  # resumes.
   foreach my $global_command (keys(%{$self->{'extra'}})) {
     if ((($Texinfo::Common::misc_commands{$global_command}
           and $Texinfo::Common::misc_commands{$global_command} =~ /^\d/)
          or $additional_setting_commands{$global_command})
         and !$global_misc_not_setting_commands{$global_command}) {
       if (ref($self->{'extra'}->{$global_command}) eq 'ARRAY') {
-        if 
(defined($Texinfo::Common::document_settable_at_commands{$global_command})) {
+        if 
(defined($Texinfo::Common::document_settable_multiple_at_commands{$global_command}))
 {
           $setting_commands_defaults{$global_command} 
-            = $Texinfo::Common::document_settable_at_commands{$global_command};
+            = 
$Texinfo::Common::document_settable_multiple_at_commands{$global_command};
         }
         foreach my $command (@{$self->{'extra'}->{$global_command}}) {
           my ($element, $root_command) = _get_element($self, $command);
@@ -372,6 +374,7 @@ sub output_ixin($$)
           #print STDERR "$element $root_command->{'extra'} $global_command\n";
         }
       } else {
+        # FIXME the value is reset just after, this is useless...
         if 
(defined($Texinfo::Common::document_settable_unique_at_commands{$global_command}))
 {
           $setting_commands_defaults{$global_command} 
             = 
$Texinfo::Common::document_settable_unique_at_commands{$global_command};
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 1e903c8..6426a3f 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -292,7 +292,7 @@ my %global_multiple_commands;
 foreach my $global_multiple_command (
   'footnote', 'hyphenation', 'insertcopying', 'printindex',
   'subtitle','titlefont', 'listoffloats', 'detailmenu', 'part',
-  keys(%Texinfo::Common::document_settable_at_commands), ) {
+  keys(%Texinfo::Common::document_settable_multiple_at_commands), ) {
   $global_multiple_commands{$global_multiple_command} = 1;
 }
 
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index 96ce3b3..aa6bd67 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -1002,7 +1002,7 @@ build_global_info2 (void)
   BUILD_GLOBAL_ARRAY(detailmenu);
   BUILD_GLOBAL_ARRAY(part);
 
-  /* from Common.pm %document_settable_at_commands */
+  /* from Common.pm %document_settable_multiple_at_commands */
   BUILD_GLOBAL_ARRAY(allowcodebreaks);
   BUILD_GLOBAL_ARRAY(clickstyle);
   BUILD_GLOBAL_ARRAY(codequotebacktick);
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 7ac03fb..eb80a7e 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -190,7 +190,7 @@ register_global_command (ELEMENT *current)
         GLOBAL_CASE(detailmenu);
         GLOBAL_CASE(part);
 
-        /* from Common.pm %document_settable_at_commands */
+        /* from Common.pm %document_settable_multiple_at_commands */
         GLOBAL_CASE(allowcodebreaks);
         GLOBAL_CASE(clickstyle);
         GLOBAL_CASE(codequotebacktick);