branch master updated: Minor changes, mostly commands and load a function instead of taking reference

[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 3f1c313  Minor changes, mostly commands and load a function instead of 
taking reference
3f1c313 is described below

commit 3f1c313965342c6dd62b1d93878b0c37be3f8e4a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Sep 5 17:14:52 2021 +0200

    Minor changes, mostly commands and load a function instead of taking
    reference
---
 tp/Texinfo/Common.pm        |  2 +-
 tp/Texinfo/Convert/Utils.pm |  1 +
 tp/Texinfo/ParserNonXS.pm   | 11 ++++++-----
 tp/Texinfo/Structuring.pm   |  4 +---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index e752591..e1a19d0 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1556,7 +1556,7 @@ sub normalize_top_node_name($)
   return $node;
 }
 
-# Argument is a converter object
+# Argument is typically a converter object
 sub _convert_text_options($)
 {
   my $self = shift;
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index ee59bd6..8d4c663 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -31,6 +31,7 @@ package Texinfo::Convert::Utils;
 use strict;
 
 use Texinfo::Common;
+# only needed in debugging comments.  Ok to keep it here anyway.
 use Texinfo::Convert::Texinfo;
 
 # debugging
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 3e33bf6..d579607 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2518,11 +2518,12 @@ sub _register_label($$$)
 }
 
 # store an index entry.
-# $current is the command element.
-# $content holds the actual content.
-# for index entries and v|ftable items, it is the index entry content, 
-# for def, it is the parsed arguments, based on the definition line 
-# arguments.
+# $COMMAND_CONTAINER is the name of the @-command the index entry
+#  is associated with, for instance 'cindex', 'defivar' or 'vtable'.
+# $CURRENT is the command element.
+# $CONTENT holds the actual content.  For index entries and v|ftable
+#  items, it is the index entry content, for def, it is the parsed
+#  arguments, based on the definition line arguments.
 sub _enter_index_entry($$$$$$$)
 {
   my ($self, $command_container, $command, $current, $content,
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 85f8fc1..fe04ea9 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -33,12 +33,10 @@ use Texinfo::Common;
 # for debugging.  Also for index entries sorting.
 use Texinfo::Convert::Text;
 # for error messages 
-use Texinfo::Convert::Texinfo;
+use Texinfo::Convert::Texinfo qw(node_extra_to_texi);
 
 use Texinfo::Convert::NodeNameNormalization;
 
-*node_extra_to_texi = \&Texinfo::Convert::Texinfo::node_extra_to_texi;
-
 use Carp qw(cluck);
 
 require Exporter;