texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Con


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoXML.pm, tp/init/chm.pm, tp/init/html32.pm, util/txixml2texi.pl: replace commands_formatting with no_arg_commands_formatting to be more precise.
Date: Fri, 03 Sep 2021 13:21:33 -0400

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 c475935  * tp/Texinfo/Convert/Converter.pm, 
tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, 
tp/Texinfo/Convert/TexinfoXML.pm, tp/init/chm.pm, tp/init/html32.pm, 
util/txixml2texi.pl: replace commands_formatting with 
no_arg_commands_formatting to be more precise.
c475935 is described below

commit c4759355cd101856d726e01e77ea112c2b2012c3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Sep 3 19:21:24 2021 +0200

    * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/DocBook.pm,
    tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoXML.pm,
    tp/init/chm.pm, tp/init/html32.pm, util/txixml2texi.pl: replace
    commands_formatting with no_arg_commands_formatting to be more
    precise.
---
 ChangeLog                        |  8 ++++
 tp/TODO                          |  2 -
 tp/Texinfo/Convert/Converter.pm  |  8 ++--
 tp/Texinfo/Convert/DocBook.pm    | 14 +++----
 tp/Texinfo/Convert/HTML.pm       | 84 ++++++++++++++++++++--------------------
 tp/Texinfo/Convert/TexinfoXML.pm | 34 ++++++++--------
 tp/init/chm.pm                   |  4 +-
 tp/init/html32.pm                | 12 +++---
 util/txixml2texi.pl              |  8 ++--
 9 files changed, 90 insertions(+), 84 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0aaa68..06ca7f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2021-09-03  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Convert/Converter.pm, tp/Texinfo/Convert/DocBook.pm,
+       tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoXML.pm,
+       tp/init/chm.pm, tp/init/html32.pm, util/txixml2texi.pl: replace
+       commands_formatting with no_arg_commands_formatting to be more
+       precise.
+
+2021-09-03  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Common.pm (%default_main_program_command_line_options),
        tp/Texinfo/Config.pm (GNUT_set_main_program_default,
        Texinfo::MainConfig, new, get_conf, set_conf), texi2any.pl
diff --git a/tp/TODO b/tp/TODO
index 75239f5..19efb24 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -20,8 +20,6 @@ Rename _set_global_multiple_commands
 
 Real API for Texinfo::Config used in html32.pm.
 
-renommer formatting_commands no_arg_commands ou approchant
-
 remettre libint-perl
 
 
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 3cb3152..2b0ba6b 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1365,8 +1365,8 @@ sub convert_index_subentries {
 
 
 # 'today' is not set here.
-our %default_xml_commands_formatting; 
-$default_xml_commands_formatting{'normal'} = {
+our %default_xml_no_arg_commands_formatting;
+$default_xml_no_arg_commands_formatting{'normal'} = {
                'TeX'          => 'TeX',
                'LaTeX'          => 'LaTeX',
                'bullet'       => '&bull;',
@@ -1432,11 +1432,11 @@ $default_xml_commands_formatting{'normal'} = {
 };
 
 foreach my $no_brace_command (keys(%Texinfo::Common::no_brace_commands)) {
-  $default_xml_commands_formatting{'normal'}->{$no_brace_command}
+  $default_xml_no_arg_commands_formatting{'normal'}->{$no_brace_command}
     = $Texinfo::Common::no_brace_commands{$no_brace_command};
 }
 
-$default_xml_commands_formatting{'normal'}->{'&'} = '&amp;';
+$default_xml_no_arg_commands_formatting{'normal'}->{'&'} = '&amp;';
 
 sub xml_comment($$)
 {
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index f30b908..5b6d475 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -91,16 +91,16 @@ my %docbook_specific_formatting = (
   " " => $nbsp,
   'tie' => $nbsp,
 );
-my %docbook_commands_formatting
-  = %{$Texinfo::Convert::Converter::default_xml_commands_formatting{'normal'}};
+my %docbook_no_arg_commands_formatting
+  = 
%{$Texinfo::Convert::Converter::default_xml_no_arg_commands_formatting{'normal'}};
 
 foreach my $command (keys(%Texinfo::Convert::Unicode::unicode_entities)) {
-  $docbook_commands_formatting{$command}
+  $docbook_no_arg_commands_formatting{$command}
    = $Texinfo::Convert::Unicode::unicode_entities{$command};
 }
 
 foreach my $command (keys(%docbook_specific_formatting)) {
-  $docbook_commands_formatting{$command} 
+  $docbook_no_arg_commands_formatting{$command}
     = $docbook_specific_formatting{$command};
 }
 
@@ -561,8 +561,8 @@ sub _convert($$;$)
   my @close_elements;
   if ($root->{'cmdname'}) {
     #warn "  got cmdname $root->{'cmdname'}\n";
-    if (defined($docbook_commands_formatting{$root->{'cmdname'}})) {
-      #warn "  has commands_formatting \n";
+    if (defined($docbook_no_arg_commands_formatting{$root->{'cmdname'}})) {
+      #warn "  has no_arg_commands_formatting \n";
       my $command;
       if ($root->{'cmdname'} eq 'click' 
           and $root->{'extra'} 
@@ -579,7 +579,7 @@ sub _convert($$;$)
         return $self->_convert(Texinfo::Common::translated_command_tree($self,
                                                                    $command));
       } else {
-        return $docbook_commands_formatting{$command};
+        return $docbook_no_arg_commands_formatting{$command};
       }
     } elsif ($root->{'cmdname'} eq 'today') {
       return $self->_convert(Texinfo::Common::expand_today($self));
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index f370475..f1c38e4 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1138,16 +1138,16 @@ sub _translate_names($)
     foreach my $context ('normal', 'preformatted', 'string') {
       foreach my $command 
(keys(%{$self->{'commands_translation'}->{$context}})) {
         $translated_commands{$command} = 1;
-        delete $self->{'commands_formatting'}->{$context}->{$command};
+        delete $self->{'no_arg_commands_formatting'}->{$context}->{$command};
         if (defined($self->{'commands_translation'}->{$context}->{$command})) {
-          $self->{'commands_formatting'}->{$context}->{$command}
+          $self->{'no_arg_commands_formatting'}->{$context}->{$command}
            = 
$self->gdt($self->{'commands_translation'}->{$context}->{$command},
                         undef, 'translated_text');
         }
       }
     }
     foreach my $command(keys(%translated_commands)) {
-      $self->_complete_commands_formatting($command);
+      $self->_complete_no_arg_commands_formatting($command);
     }
   }
 }
@@ -1315,16 +1315,16 @@ foreach my $ignored_block_commands ('ignore', 'macro', 
'rmacro', 'copying',
 # 'normal' in normal text, 'preformatted' in @example and similar
 # commands, and 'string' for contexts where HTML elements should not
 # be used.
-my %default_commands_formatting;
+my %default_no_arg_commands_formatting;
 
-foreach my $command 
(keys(%{$Texinfo::Convert::Converter::default_xml_commands_formatting{'normal'}}))
 {
-  $default_commands_formatting{'normal'}->{$command} = 
-    
$Texinfo::Convert::Converter::default_xml_commands_formatting{'normal'}->{$command};
+foreach my $command 
(keys(%{$Texinfo::Convert::Converter::default_xml_no_arg_commands_formatting{'normal'}}))
 {
+  $default_no_arg_commands_formatting{'normal'}->{$command} =
+    
$Texinfo::Convert::Converter::default_xml_no_arg_commands_formatting{'normal'}->{$command};
 }
 
-$default_commands_formatting{'normal'}->{' '} = '&nbsp;';
-$default_commands_formatting{'normal'}->{"\t"} = '&nbsp;';
-$default_commands_formatting{'normal'}->{"\n"} = '&nbsp;';
+$default_no_arg_commands_formatting{'normal'}->{' '} = '&nbsp;';
+$default_no_arg_commands_formatting{'normal'}->{"\t"} = '&nbsp;';
+$default_no_arg_commands_formatting{'normal'}->{"\n"} = '&nbsp;';
 
 my %default_commands_translation;
 # possible example of use, right now not used, as 'translated_commands'
@@ -1336,13 +1336,13 @@ my %default_commands_translation;
 #  $not_existing->gdt('error--&gt;');
 #}
 
-$default_commands_formatting{'normal'}->{'enddots'} 
+$default_no_arg_commands_formatting{'normal'}->{'enddots'}
     = '<small class="enddots">...</small>';
-$default_commands_formatting{'preformatted'}->{'enddots'} = '...';
-$default_commands_formatting{'normal'}->{'*'} = '<br>';
+$default_no_arg_commands_formatting{'preformatted'}->{'enddots'} = '...';
+$default_no_arg_commands_formatting{'normal'}->{'*'} = '<br>';
 # this is used in math too, not sure that it is the best
 # in that context, '<br>' could be better.
-$default_commands_formatting{'preformatted'}->{'*'} = "\n";
+$default_no_arg_commands_formatting{'preformatted'}->{'*'} = "\n";
 
 
 sub _convert_no_arg_command($$$)
@@ -1355,15 +1355,15 @@ sub _convert_no_arg_command($$$)
       and exists($command->{'extra'}->{'clickstyle'})) {
     my $click_cmdname = $command->{'extra'}->{'clickstyle'};
     if (($self->in_preformatted() or $self->in_math()
-         and 
$self->{'commands_formatting'}->{'preformatted'}->{$click_cmdname})
+         and 
$self->{'no_arg_commands_formatting'}->{'preformatted'}->{$click_cmdname})
         or ($self->in_string() and 
-            $self->{'commands_formatting'}->{'string'}->{$click_cmdname})
-        or ($self->{'commands_formatting'}->{'normal'}->{$click_cmdname})) {
+            
$self->{'no_arg_commands_formatting'}->{'string'}->{$click_cmdname})
+        or 
($self->{'no_arg_commands_formatting'}->{'normal'}->{$click_cmdname})) {
       $cmdname = $click_cmdname;
     }
   }
   if ($self->in_upper_case() and $letter_no_arg_commands{$cmdname}
-      and $self->{'commands_formatting'}->{'normal'}->{uc($cmdname)}) {
+      and $self->{'no_arg_commands_formatting'}->{'normal'}->{uc($cmdname)}) {
     $cmdname = uc($cmdname);
   }
 
@@ -1373,16 +1373,16 @@ sub _convert_no_arg_command($$$)
          $self->gdt($self->{'translated_commands'}->{$cmdname}));
   }
   if ($self->in_preformatted() or $self->in_math()) {
-    $result = $self->{'commands_formatting'}->{'preformatted'}->{$cmdname};
+    $result = 
$self->{'no_arg_commands_formatting'}->{'preformatted'}->{$cmdname};
   } elsif ($self->in_string()) {
-    $result = $self->{'commands_formatting'}->{'string'}->{$cmdname};
+    $result = $self->{'no_arg_commands_formatting'}->{'string'}->{$cmdname};
   } else {
-    $result = $self->{'commands_formatting'}->{'normal'}->{$cmdname};
+    $result = $self->{'no_arg_commands_formatting'}->{'normal'}->{$cmdname};
   }
   return $result;
 }
 
-foreach my $command(keys(%{$default_commands_formatting{'normal'}})) {
+foreach my $command(keys(%{$default_no_arg_commands_formatting{'normal'}})) {
   $default_commands_conversion{$command} = \&_convert_no_arg_command;
 }
 
@@ -4979,20 +4979,20 @@ sub _use_entity_is_entity($$)
   return 1 if ($text =~ /^&/ and $text =~ /;$/);
 }
 
-sub _complete_commands_formatting($$)
+sub _complete_no_arg_commands_formatting($$)
 {
   my $self = shift;
   my $command = shift;
-  if (!defined ($self->{'commands_formatting'}->{'normal'}->{$command})) {
-    $self->{'commands_formatting'}->{'normal'}->{$command} = '';
+  if (!defined 
($self->{'no_arg_commands_formatting'}->{'normal'}->{$command})) {
+    $self->{'no_arg_commands_formatting'}->{'normal'}->{$command} = '';
   }
-  if (!defined ($self->{'commands_formatting'}->{'preformatted'}->{$command})) 
{
-    $self->{'commands_formatting'}->{'preformatted'}->{$command} = 
-      $self->{'commands_formatting'}->{'normal'}->{$command};
+  if (!defined 
($self->{'no_arg_commands_formatting'}->{'preformatted'}->{$command})) {
+    $self->{'no_arg_commands_formatting'}->{'preformatted'}->{$command} =
+      $self->{'no_arg_commands_formatting'}->{'normal'}->{$command};
   }
-  if (!defined ($self->{'commands_formatting'}->{'string'}->{$command})) {
-   $self->{'commands_formatting'}->{'string'}->{$command} = 
-      $self->{'commands_formatting'}->{'preformatted'}->{$command};
+  if (!defined 
($self->{'no_arg_commands_formatting'}->{'string'}->{$command})) {
+   $self->{'no_arg_commands_formatting'}->{'string'}->{$command} =
+      $self->{'no_arg_commands_formatting'}->{'preformatted'}->{$command};
   }
 }
 
@@ -5180,22 +5180,22 @@ sub converter_initialize($)
   }
 
   foreach my $context ('normal', 'preformatted', 'string') {
-    foreach my $command (keys(%{$default_commands_formatting{'normal'}})) {
-      if (exists 
($Texinfo::Config::commands_formatting{$context}->{$command})) {
-        $self->{'commands_formatting'}->{$context}->{$command} 
-           = $Texinfo::Config::commands_formatting{$context}->{$command};
+    foreach my $command 
(keys(%{$default_no_arg_commands_formatting{'normal'}})) {
+      if (exists 
($Texinfo::Config::no_arg_commands_formatting{$context}->{$command})) {
+        $self->{'no_arg_commands_formatting'}->{$context}->{$command}
+           = 
$Texinfo::Config::no_arg_commands_formatting{$context}->{$command};
       } else {
-        if (defined($default_commands_formatting{$context}->{$command})) {
+        if 
(defined($default_no_arg_commands_formatting{$context}->{$command})) {
           if ($self->get_conf('ENABLE_ENCODING') 
               and Texinfo::Convert::Unicode::unicode_for_brace_no_arg_command(
                              $command, $self->get_conf('OUTPUT_ENCODING_NAME'))
-              and 
!$self->_use_entity_is_entity($default_commands_formatting{$context}->{$command}))
 {
-            $self->{'commands_formatting'}->{$context}->{$command}
+              and 
!$self->_use_entity_is_entity($default_no_arg_commands_formatting{$context}->{$command}))
 {
+            $self->{'no_arg_commands_formatting'}->{$context}->{$command}
               = Texinfo::Convert::Unicode::unicode_for_brace_no_arg_command(
                            $command, $self->get_conf('OUTPUT_ENCODING_NAME'));
           } else {
-            $self->{'commands_formatting'}->{$context}->{$command} 
-              = $default_commands_formatting{$context}->{$command};
+            $self->{'no_arg_commands_formatting'}->{$context}->{$command}
+              = $default_no_arg_commands_formatting{$context}->{$command};
           }
         }
       }
@@ -5213,11 +5213,11 @@ sub converter_initialize($)
 
   # set sane defaults in case there is none and the default formatting
   # function is used
-  foreach my $command (keys(%{$default_commands_formatting{'normal'}})) {
+  foreach my $command (keys(%{$default_no_arg_commands_formatting{'normal'}})) 
{
     if ($self->{'commands_conversion'}->{$command} 
         and $self->{'commands_conversion'}->{$command} 
             eq $default_commands_conversion{$command}) {
-      $self->_complete_commands_formatting($command);
+      $self->_complete_no_arg_commands_formatting($command);
     }
   }
 
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 6828e43..a59bbdc 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -64,7 +64,7 @@ my %defaults = (
 
 
 # our because it is used in the xml to texi translator
-our %commands_formatting = (
+our %no_arg_commands_formatting = (
            '*' => 'linebreak',
            ' ' => ['spacecmd', 'type', 'spc'],
            "\t" => ['spacecmd', 'type', 'tab'],
@@ -107,7 +107,7 @@ our %commands_formatting = (
            'rbracechar'   => 'rbracechar',
            'backslashchar' => 'backslashchar',
            'hashchar'      => 'hashchar',
-           # in Texinfo::Convert::Converter::default_xml_commands_formatting,
+           # in 
Texinfo::Convert::Converter::default_xml_no_arg_commands_formatting,
            # guillemotleft and guillemotright are mapped to laquo and raquo,
            # but guillemetleft and guillemetright are also mapped to those
            # entities.  To make sure that it is possible to go back to the
@@ -118,19 +118,19 @@ our %commands_formatting = (
 
 # use default XML formatting to complete the hash, removing XML
 # specific formatting.  This avoids some code duplication.
-my %default_xml_commands_formatting = 
-    %{$Texinfo::Convert::Converter::default_xml_commands_formatting{'normal'}};
-
-foreach my $command (keys(%default_xml_commands_formatting)) {
-  if (!exists($commands_formatting{$command})) {
-    if ($default_xml_commands_formatting{$command} ne '') {
-      if ($default_xml_commands_formatting{$command} =~ /^&(.*);$/) {
-        $commands_formatting{$command} = $1;
+my %default_xml_no_arg_commands_formatting = 
+    
%{$Texinfo::Convert::Converter::default_xml_no_arg_commands_formatting{'normal'}};
+
+foreach my $command (keys(%default_xml_no_arg_commands_formatting)) {
+  if (!exists($no_arg_commands_formatting{$command})) {
+    if ($default_xml_no_arg_commands_formatting{$command} ne '') {
+      if ($default_xml_no_arg_commands_formatting{$command} =~ /^&(.*);$/) {
+        $no_arg_commands_formatting{$command} = $1;
       } else {
-        die "BUG: Strange xml_commands_formatting: 
$default_xml_commands_formatting{$command}\n";
+        die "BUG: Strange xml_no_arg_commands_formatting: 
$default_xml_no_arg_commands_formatting{$command}\n";
       }
     } else {
-      $commands_formatting{$command} = '';
+      $no_arg_commands_formatting{$command} = '';
     }
   }
 }
@@ -212,8 +212,8 @@ sub format_atom($$)
 {
   my $self = shift;
   my $atom = shift;
-  if ($commands_formatting{$atom} ne '') {
-    return '&'.$commands_formatting{$atom}.';';
+  if ($no_arg_commands_formatting{$atom} ne '') {
+    return '&'.$no_arg_commands_formatting{$atom}.';';
   } else {
     return '';
   }
@@ -494,10 +494,10 @@ sub _format_command($$)
   my $self = shift;
   my $command = shift;
 
-  if (! ref($commands_formatting{$command})) {
+  if (! ref($no_arg_commands_formatting{$command})) {
     return $self->format_atom($command);
   } else {
-    my @spec = @{$commands_formatting{$command}};
+    my @spec = @{$no_arg_commands_formatting{$command}};
     my $element_name = shift @spec;
     return $self->element($element_name, \@spec);
   }
@@ -756,7 +756,7 @@ sub _convert($$;$)
   }
   my @close_elements;
   if ($root->{'cmdname'}) {
-    if (defined($commands_formatting{$root->{'cmdname'}})) {
+    if (defined($no_arg_commands_formatting{$root->{'cmdname'}})) {
       if ($root->{'cmdname'} eq 'click' 
           and $root->{'extra'} 
           and defined($root->{'extra'}->{'clickstyle'})) {
diff --git a/tp/init/chm.pm b/tp/init/chm.pm
index 55a9356..eb08883 100644
--- a/tp/init/chm.pm
+++ b/tp/init/chm.pm
@@ -54,7 +54,7 @@ texinfo_set_from_init_file('footnotestyle', 'end');
 #FIXME remove that later?
 texinfo_set_from_init_file('USE_NODES', 0);
 
-use vars qw(%commands_formatting);
+use vars qw(%no_arg_commands_formatting);
 texinfo_register_formatting_function('format_end_file', \&chm_format_end_file);
 texinfo_register_formatting_function('format_navigation_header', \&chm_noop);
 texinfo_register_formatting_function('format_navigation_header_panel', 
\&chm_noop);
@@ -175,7 +175,7 @@ my %hhc_global_property = (
 
 # at least kchmviewer has trouble with the corresponding textual entities
 foreach my $thing ('OE', 'oe', 'euro') {
-  $commands_formatting{'normal'}->{$thing} 
+  $no_arg_commands_formatting{'normal'}->{$thing}
     = $Texinfo::Convert::Unicode::unicode_entities{$thing};
 }
 
diff --git a/tp/init/html32.pm b/tp/init/html32.pm
index a0f2bcc..6f57a08 100644
--- a/tp/init/html32.pm
+++ b/tp/init/html32.pm
@@ -26,7 +26,7 @@
 use strict;
 use Texinfo::Convert::Converter qw(xml_protect_text);
 
-use vars qw(%commands_formatting %style_commands_formatting);
+use vars qw(%no_arg_commands_formatting %style_commands_formatting);
 
 texinfo_set_from_init_file('COMPLEX_FORMAT_IN_TABLE', 1);
 
@@ -62,17 +62,17 @@ foreach my $command ('euro', 'geq', 'leq',
    'quotedblbase', 'quotesinglbase', 'guillemetleft', 'guillemetright',
    'guillemotleft', 'guillemotright', 'guilsinglleft', 'guilsinglright') {
   
-  $commands_formatting{'normal'}->{$command}
+  $no_arg_commands_formatting{'normal'}->{$command}
     = xml_protect_text(undef,
              $Texinfo::Convert::Text::text_brace_no_arg_commands{$command});
 }
 
-$commands_formatting{'normal'}->{'oe'} = '&#156;';
-$commands_formatting{'normal'}->{'OE'} = '&#140;';
+$no_arg_commands_formatting{'normal'}->{'oe'} = '&#156;';
+$no_arg_commands_formatting{'normal'}->{'OE'} = '&#140;';
 
 foreach my $dots ('dots', 'enddots') {
-  $commands_formatting{'normal'}->{$dots} = '<small>...</small>';
-  $commands_formatting{'preformatted'}->{$dots} = '...';
+  $no_arg_commands_formatting{'normal'}->{$dots} = '<small>...</small>';
+  $no_arg_commands_formatting{'preformatted'}->{$dots} = '...';
 }
 
 foreach my $context ('preformatted', 'normal') {
diff --git a/util/txixml2texi.pl b/util/txixml2texi.pl
index 2d7cde0..ab585c4 100755
--- a/util/txixml2texi.pl
+++ b/util/txixml2texi.pl
@@ -126,12 +126,12 @@ my %entity_texts = (
   'attrformfeed' => "\f",
 );
 
-foreach my $command (keys(%Texinfo::Convert::TexinfoXML::commands_formatting)) 
{
-  if (!ref($Texinfo::Convert::TexinfoXML::commands_formatting{$command})) {
-    $entity_texts{$Texinfo::Convert::TexinfoXML::commands_formatting{$command}}
+foreach my $command 
(keys(%Texinfo::Convert::TexinfoXML::no_arg_commands_formatting)) {
+  if 
(!ref($Texinfo::Convert::TexinfoXML::no_arg_commands_formatting{$command})) {
+    
$entity_texts{$Texinfo::Convert::TexinfoXML::no_arg_commands_formatting{$command}}
       = command_with_braces($command);
   } else {
-    my $spec = $Texinfo::Convert::TexinfoXML::commands_formatting{$command};
+    my $spec = 
$Texinfo::Convert::TexinfoXML::no_arg_commands_formatting{$command};
     my $element = $spec->[0];
     if ($element eq 'spacecmd') {
       if ($spec->[1] eq 'type') {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]