branch master updated: * tp/Texinfo/Convert/Info.pm (format_error_outside_of_any_node), tp/Texinfo/Convert/Plaintext.pm (process_footnotes, _menu, _convert): rename $self->{'node'} as $self->{'current_node'}.

[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 e085463210 * tp/Texinfo/Convert/Info.pm 
(format_error_outside_of_any_node), tp/Texinfo/Convert/Plaintext.pm 
(process_footnotes, _menu, _convert): rename $self->{'node'} as 
$self->{'current_node'}.
e085463210 is described below

commit e0854632101e70295fbafad5cc50e535cb0a76cf
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jan 1 11:52:53 2022 +0100

    * tp/Texinfo/Convert/Info.pm (format_error_outside_of_any_node),
    tp/Texinfo/Convert/Plaintext.pm (process_footnotes, _menu, _convert):
    rename $self->{'node'} as $self->{'current_node'}.
---
 ChangeLog                       |  6 ++++++
 tp/Texinfo/Convert/Info.pm      |  2 +-
 tp/Texinfo/Convert/Plaintext.pm | 18 +++++++++---------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 843a89cf9e..5c4a031858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-01-01  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Info.pm (format_error_outside_of_any_node),
+       tp/Texinfo/Convert/Plaintext.pm (process_footnotes, _menu, _convert):
+       rename $self->{'node'} as $self->{'current_node'}.
+
 2022-01-01  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (element_is_tree_unit_top): simplify
diff --git a/tp/Texinfo/Convert/Info.pm b/tp/Texinfo/Convert/Info.pm
index 8e50ef0711..aada0de132 100644
--- a/tp/Texinfo/Convert/Info.pm
+++ b/tp/Texinfo/Convert/Info.pm
@@ -399,7 +399,7 @@ sub format_error_outside_of_any_node($$)
 {
   my $self = shift;
   my $element = shift;
-  if (!$self->{'node'}) {
+  if (!$self->{'current_node'}) {
     $self->line_warn($self,
          sprintf(__("\@%s outside of any node"),
                      $element->{'cmdname'}), $element->{'line_nr'});
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 1ee2fc3a63..563eda418e 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -855,7 +855,7 @@ sub process_footnotes($;$)
         'extra' => {'node_content' => $node_contents }
       };
       $result .= $self->format_node($footnotes_node);
-      $self->{'node'} = $footnotes_node;
+      $self->{'current_node'} = $footnotes_node;
     }
     while (@{$self->{'pending_footnotes'}}) {
       my $footnote = shift (@{$self->{'pending_footnotes'}});
@@ -1139,8 +1139,8 @@ sub _menu($$)
     my $result = "* Menu:\n\n";
     add_text_count($self, $result);
     _add_lines_count($self, 2);
-    if ($self->{'node'}) {
-      $self->{'seenmenus'}->{$self->{'node'}} = 1;
+    if ($self->{'current_node'}) {
+      $self->{'seenmenus'}->{$self->{'current_node'}} = 1;
     }
     return $result;
   } else {
@@ -1629,8 +1629,8 @@ sub _convert($$)
     # in @insertcopying.
     # This also covers the case of an index entry in a node added by a 
     # @footnote with footnotestyle separate.
-    if ($self->{'node'}) {
-      $location->{'node'} = $self->{'node'};
+    if ($self->{'current_node'}) {
+      $location->{'node'} = $self->{'current_node'};
     }
     $self->{'index_entries_line_location'}->{$element} = $location;
   }
@@ -1945,14 +1945,14 @@ sub _convert($$)
       $result .= _count_added($self, $formatter->{'container'},
            add_next($formatter->{'container'},
                     "($formatted_footnote_number)", 1));
-      if ($self->get_conf('footnotestyle') eq 'separate' and $self->{'node'}) {
+      if ($self->get_conf('footnotestyle') eq 'separate' and 
$self->{'current_node'}) {
         $result .= _convert($self, {'contents' => 
          [{'text' => ' ('},
           {'cmdname' => 'pxref',
            'args' => [
              {'type' => 'brace_command_arg',
               'contents' => [
-                 @{$self->{'node'}->{'extra'}->{'node_content'}},
+                 @{$self->{'current_node'}->{'extra'}->{'node_content'}},
                  {'text' => "-Footnote-$self->{'footnote_index'}"}
               ]
              }
@@ -2424,7 +2424,7 @@ sub _convert($$)
         }
       }
     } elsif ($command eq 'node') {
-      $self->{'node'} = $element;
+      $self->{'current_node'} = $element;
       $result .= $self->format_node($element);
       $self->{'format_context'}->[-1]->{'paragraph_count'} = 0;
     } elsif ($sectioning_commands{$command}) {
@@ -3240,7 +3240,7 @@ sub _convert($$)
         and $sectioning_commands{$command}
         and $command ne 'part') {
       # add menu if missing
-      my $node = $self->{'node'};
+      my $node = $self->{'current_node'};
       my $automatic_directions;
       if ($node and defined($node->{'extra'}->{'nodes_manuals'})) {
         $automatic_directions =