branch master updated: * tp/Texinfo/Convert/LaTeX.pm (output, convert, convert_tree): always call _pop_context after _push_new_context.

[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 e4795c6981 * tp/Texinfo/Convert/LaTeX.pm (output, convert, 
convert_tree): always call _pop_context after _push_new_context.
e4795c6981 is described below

commit e4795c69810be9dee279a5d3498a54bebb6753ba
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jan 2 14:37:23 2022 +0100

    * tp/Texinfo/Convert/LaTeX.pm (output, convert, convert_tree): always
    call _pop_context after _push_new_context.
---
 ChangeLog                   |  5 +++++
 tp/Texinfo/Convert/LaTeX.pm | 31 +++++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afa660e7a1..681f4532b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-01-02  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/LaTeX.pm (output, convert, convert_tree): always
+       call _pop_context after _push_new_context.
+
 2022-01-02  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/LaTeX.pm: use 
Texinfo::Common::document_settable_at_commands
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 933d47c044..416da32d24 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -993,6 +993,7 @@ sub output($$)
   $result .= $self->write_or_return($self->_latex_header(), $fh);
   _push_new_context($self, 'main');
   $result .= $self->write_or_return($self->convert_tree($modified_root), $fh);
+  _pop_context($self);
   $result .= $self->write_or_return($self->_latex_footer(), $fh);
 
   #print $result;
@@ -1017,12 +1018,19 @@ sub convert($$)
 
   $self->_prepare_conversion($root);
 
+  my $new_context;
   if (not exists($self->{'formatting_context'})
       or scalar(@{$self->{'formatting_context'}}) == 0) {
     _push_new_context($self, 'document');
+    $new_context = 1;
   }
-  
-  return $self->_convert($root);
+
+  my $result = $self->_convert($root);
+
+  if ($new_context) {
+    _pop_context($self);
+  }
+  return $result;
 }
 
 # a context should have been set by the caller
@@ -1031,12 +1039,19 @@ sub convert_tree($$)
   my $self = shift;
   my $root = shift;
 
+  my $new_context;
   if (not exists($self->{'formatting_context'})
       or scalar(@{$self->{'formatting_context'}}) == 0) {
     _push_new_context($self, 'tree');
+    $new_context = 1;
   }
 
-  return $self->_convert($root);
+  my $result = $self->_convert($root);
+
+  if ($new_context) {
+    _pop_context($self);
+  }
+  return $result;
 }
 
 # ellipsis leaves less spacing after \dots in case it is followed
@@ -1192,7 +1207,7 @@ sub _latex_header {
           my $float = $self->{'floats'}->{$normalized_float_type}->[0];
           my $float_type_contents = $float->{'extra'}->{'type'}->{'content'};
           my $float_type = _convert($self, {'contents' => 
$float_type_contents});
-          $self->_pop_context();
+          _pop_context($self);
         }
         my $floats_extension = $self->{'floats_extension'};
         $header .= "% new float for type `$normalized_float_type'\n";
@@ -2212,7 +2227,7 @@ sub _convert($$)
       $result .= '\footnote{';
       $result .= $self->_convert($element->{'args'}->[0]);
       $result .= '}';
-      $self->_pop_context();
+      _pop_context($self);
       return $result;
     } elsif ($cmdname eq 'anchor') {
       my $anchor_label = 
_tree_anchor_label($element->{'extra'}->{'node_content'});
@@ -2534,7 +2549,7 @@ sub _convert($$)
       _push_new_context($self, 'latex_caption');
       my $caption_text = _convert($self,
          {'contents' => $element->{'args'}->[0]->{'contents'}});
-      $self->_pop_context();
+      _pop_context($self);
       
       $result .= '\caption';
 
@@ -2542,7 +2557,7 @@ sub _convert($$)
         _push_new_context($self, 'latex_shortcaption');
         my $shortcaption_text = _convert($self, 
                        {'contents' => 
$shortcaption->{'args'}->[0]->{'contents'}});
-        $self->_pop_context();
+        _pop_context($self);
         $result .= '['.$shortcaption_text.']';
       }
       $result .= "{$caption_text}\n";
@@ -3296,7 +3311,7 @@ sub _convert($$)
       }
       my $latex_float_name = 
$self->{'normalized_float_latex'}->{$normalized_float_type};
       $result .= "\\end{$latex_float_name}\n";
-      $self->_pop_context();
+      _pop_context($self);
     } elsif ($cmdname eq 'quotation'
                or $cmdname eq 'smallquotation') {
       if ($element->{'extra'} and $element->{'extra'}->{'authors'}) {