branch master updated: * tp/Texinfo/Convert/Converter.pm (%xml_text_entity_no_arg_commands_formatting), tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoXML.pm: replace %default_xml_no_arg_commands_formatting{'normal'} by %xml_text_entity_no_arg_commands_formatting.

[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 8898348b9d * tp/Texinfo/Convert/Converter.pm 
(%xml_text_entity_no_arg_commands_formatting), tp/Texinfo/Convert/DocBook.pm, 
tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoXML.pm: replace 
%default_xml_no_arg_commands_formatting{'normal'} by 
%xml_text_entity_no_arg_commands_formatting.
8898348b9d is described below

commit 8898348b9d5334347ba3d18c7da8db63423f029a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Jan 7 18:30:55 2022 +0100

    * tp/Texinfo/Convert/Converter.pm
    (%xml_text_entity_no_arg_commands_formatting),
    tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm,
    tp/Texinfo/Convert/TexinfoXML.pm:
    replace %default_xml_no_arg_commands_formatting{'normal'}
    by %xml_text_entity_no_arg_commands_formatting.
    
    * tp/Texinfo/Convert/HTML.pm (%style_commands_element):
    rename %style_attribute_commands as %style_commands_element.
---
 ChangeLog                        | 12 ++++++++++++
 tp/TODO                          |  3 +++
 tp/Texinfo/Convert/Converter.pm  |  9 ++++-----
 tp/Texinfo/Convert/DocBook.pm    |  2 +-
 tp/Texinfo/Convert/HTML.pm       | 21 +++++++++++----------
 tp/Texinfo/Convert/TexinfoXML.pm |  2 +-
 6 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e0573a7325..5c2d7eafaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-01-06  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Converter.pm
+       (%xml_text_entity_no_arg_commands_formatting),
+       tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm,
+       tp/Texinfo/Convert/TexinfoXML.pm:
+       replace %default_xml_no_arg_commands_formatting{'normal'}
+       by %xml_text_entity_no_arg_commands_formatting.
+
+       * tp/Texinfo/Convert/HTML.pm (%style_commands_element):
+       rename %style_attribute_commands as %style_commands_element.
+
 2022-01-06  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (%default_main_program_customization),
diff --git a/tp/TODO b/tp/TODO
index 15e5013234..f686d29d2a 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -15,6 +15,9 @@ Before next release
 
 LaTeX collect packages.
 
+
+<small class="enddots" through collect css
+
 Bugs
 ====
 
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 65441552fd..a39282914d 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1406,8 +1406,7 @@ sub xml_protect_text($$)
 }
 
 # 'today' is not set here.
-our %default_xml_no_arg_commands_formatting;
-$default_xml_no_arg_commands_formatting{'normal'} = {
+our %xml_text_entity_no_arg_commands_formatting = (
                'TeX'          => 'TeX',
                'LaTeX'          => 'LaTeX',
                'bullet'       => '&bull;',
@@ -1470,14 +1469,14 @@ $default_xml_no_arg_commands_formatting{'normal'} = {
                'guillemotright'          => '&raquo;',
                'guilsinglleft'          => '&lsaquo;',
                'guilsinglright'          => '&rsaquo;',
-};
+);
 
 foreach my $no_brace_command (keys(%Texinfo::Common::no_brace_commands)) {
-  $default_xml_no_arg_commands_formatting{'normal'}->{$no_brace_command}
+  $xml_text_entity_no_arg_commands_formatting{$no_brace_command}
     = $Texinfo::Common::no_brace_commands{$no_brace_command};
 }
 
-$default_xml_no_arg_commands_formatting{'normal'}->{'&'} = '&amp;';
+$xml_text_entity_no_arg_commands_formatting{'&'} = '&amp;';
 
 sub xml_comment($$)
 {
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 3bfd0ddf5c..27362becaa 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -80,7 +80,7 @@ my %docbook_specific_formatting = (
   'tie' => $nbsp,
 );
 my %docbook_no_arg_commands_formatting
-  = 
%{$Texinfo::Convert::Converter::default_xml_no_arg_commands_formatting{'normal'}};
+  = %Texinfo::Convert::Converter::xml_text_entity_no_arg_commands_formatting;
 
 foreach my $command (keys(%Texinfo::Convert::Unicode::unicode_entities)) {
   $docbook_no_arg_commands_formatting{$command}
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 7d3c3cbbcc..e24dbee666 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1802,9 +1802,9 @@ foreach my $ignored_block_commands ('ignore', 'macro', 
'rmacro', 'copying',
 # be used.
 my %default_no_arg_commands_formatting;
 
-foreach my $command 
(keys(%{$Texinfo::Convert::Converter::default_xml_no_arg_commands_formatting{'normal'}}))
 {
+foreach my $command 
(keys(%Texinfo::Convert::Converter::xml_text_entity_no_arg_commands_formatting))
 {
   $default_no_arg_commands_formatting{'normal'}->{$command} =
-    
$Texinfo::Convert::Converter::default_xml_no_arg_commands_formatting{'normal'}->{$command};
+    
$Texinfo::Convert::Converter::xml_text_entity_no_arg_commands_formatting{$command};
 }
 
 $default_no_arg_commands_formatting{'normal'}->{' '} = '&nbsp;';
@@ -1950,6 +1950,7 @@ sub _convert_no_arg_command($$$)
   } else {
     $result = $self->{'no_arg_commands_formatting'}->{'normal'}->{$cmdname};
   }
+
   return $result;
 }
 
@@ -2008,8 +2009,8 @@ foreach my $quoted_command ('samp') {
   $quoted_style_commands{$quoted_command} = 1;
 }
 
-my %style_attribute_commands;
-$style_attribute_commands{'normal'} = {
+my %style_commands_element;
+$style_commands_element{'normal'} = {
       'b'           => 'b',
       'cite'        => 'cite',
       'code'        => 'code',
@@ -2042,20 +2043,20 @@ my %style_commands_formatting;
 # it is required since math is not in the %style_commands as it is 
 # in context command.
 my @all_style_commands = keys %{{ map { $_ => 1 } 
-    (keys(%style_commands), keys(%{$style_attribute_commands{'normal'}}),
+    (keys(%style_commands), keys(%{$style_commands_element{'normal'}}),
      'dmn') }};
 
 foreach my $command(@all_style_commands) {
   # default is no attribute.
-  if ($style_attribute_commands{'normal'}->{$command}) {
+  if ($style_commands_element{'normal'}->{$command}) {
     $style_commands_formatting{'normal'}->{$command}->{'attribute'}
-     = $style_attribute_commands{'normal'}->{$command};
+     = $style_commands_element{'normal'}->{$command};
     $style_commands_formatting{'preformatted'}->{$command}->{'attribute'}
-     = $style_attribute_commands{'normal'}->{$command};
+     = $style_commands_element{'normal'}->{$command};
   }
-  if ($style_attribute_commands{'preformatted'}->{$command}) {
+  if ($style_commands_element{'preformatted'}->{$command}) {
     $style_commands_formatting{'preformatted'}->{$command}->{'attribute'} =
-      $style_attribute_commands{'preformatted'}->{$command}; 
+      $style_commands_element{'preformatted'}->{$command}; 
   }
   if ($quoted_style_commands{$command}) {
     foreach my $context ('normal', 'string', 'preformatted') {
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index add58b3fb5..aa6889725d 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -108,7 +108,7 @@ our %no_arg_commands_formatting = (
 # use default XML formatting to complete the hash, removing XML
 # specific formatting.  This avoids some code duplication.
 my %default_xml_no_arg_commands_formatting =
-    
%{$Texinfo::Convert::Converter::default_xml_no_arg_commands_formatting{'normal'}};
+    %Texinfo::Convert::Converter::xml_text_entity_no_arg_commands_formatting;
 
 foreach my $command (keys(%default_xml_no_arg_commands_formatting)) {
   if (!exists($no_arg_commands_formatting{$command})) {