branch master updated: Change in comments, remove unused code.

[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 3aca024f7a Change in comments, remove unused code.
3aca024f7a is described below

commit 3aca024f7a3e27341f05f90154594710f78380d7
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Sep 9 12:38:58 2022 +0200

    Change in comments, remove unused code.
---
 tp/Texinfo/Common.pm          | 2 +-
 tp/Texinfo/Convert/DocBook.pm | 3 +++
 tp/Texinfo/Convert/Texinfo.pm | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 7851f6f4da..bd3aa99355 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1142,7 +1142,7 @@ foreach my $formattable_misc_command ('insertcopying',
   $formattable_misc_commands{$formattable_misc_command} = 1;
 }
 
-
+# used in converters, not in the parser
 our %misc_commands = (%line_commands, %other_commands);
 
 $root_commands{'node'} = 1;
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index cf279cd606..99e529fbac 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -769,6 +769,9 @@ sub _convert($$;$)
       return $self->_index_entry($element).${end_line};
 
     } elsif (exists($docbook_misc_commands{$element->{'cmdname'}})) {
+      # FIXME redo code to use directly commands and not be based on the
+      # %misc_commands type.  Also probably ignore %other_commands
+      # right away
       #warn "  is dbk misc command\n";
       if ($docbook_global_commands{$element->{'cmdname'}}) {
         Texinfo::Common::set_informative_command_value($self, $element);
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 322316cf35..d3f48a4e3c 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -42,7 +42,6 @@ use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
 $VERSION = '6.8dev';
 
 
-my %misc_commands            = %Texinfo::Common::misc_commands;
 my %brace_commands           = %Texinfo::Common::brace_commands;
 my %block_commands           = %Texinfo::Common::block_commands;
 my %def_commands             = %Texinfo::Common::def_commands;
@@ -165,7 +164,7 @@ sub _expand_cmd_args_to_texi($;$) {
   if ($cmd->{'extra'} and exists ($cmd->{'extra'}->{'spaces'})) {
     $result .= $cmd->{'extra'}->{'spaces'};
   }
-  # must be before the next condition
+  # block line commands with arguments not separated by commas
   if ($block_commands{$cmdname}
          and ($def_commands{$cmdname}
               or $block_commands{$cmdname} eq 'multitable')