branch master updated: * tp/Texinfo/Convert/Plaintext.pm (_convert, format_contents): Call convert_line_new_context with encoding disabled in more places and pass the result to _stream_output rather than _stream_output_encoded.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 7776d05b8c * tp/Texinfo/Convert/Plaintext.pm (_convert, 
format_contents): Call convert_line_new_context with encoding disabled in more 
places and pass the result to _stream_output rather than _stream_output_encoded.
7776d05b8c is described below

commit 7776d05b8c1ddd6d1e5ada14ecb690b509c03278
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Jan 23 19:34:37 2024 +0000

    * tp/Texinfo/Convert/Plaintext.pm (_convert, format_contents):
    Call convert_line_new_context with encoding disabled in more
    places and pass the result to _stream_output rather than
    _stream_output_encoded.
---
 ChangeLog                       |  7 +++++++
 tp/Texinfo/Convert/Plaintext.pm | 16 +++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53919ed69a..1dcb3a6d94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-01-23  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/Convert/Plaintext.pm (_convert, format_contents):
+       Call convert_line_new_context with encoding disabled in more
+       places and pass the result to _stream_output rather than
+       _stream_output_encoded.
+
 2024-01-23  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/Convert/Plaintext.pm (convert_line_new_context):
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 3614ab573b..58e5f693d8 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1413,10 +1413,10 @@ sub format_contents($$$)
       }
       my ($text, undef) = $self->convert_line_new_context(
             {'contents' => [$section_title_tree],
-             'type' => 'frenchspacing'});
+             'type' => 'frenchspacing'}, undef, 1);
       chomp ($text);
       $text .= "\n";
-      _stream_output_encoded($self, $text);
+      _stream_output($self, undef, $text);
       $lines_count++;
       if ($section->{'extra'}->{'section_childs'}
           and ($contents
@@ -2470,8 +2470,6 @@ sub _convert($$)
               and scalar(@{$label_element->{'contents'}}) == 1
               and defined($label_element->{'contents'}->[0]->{'text'})) {
             $node_line_name = $label_element->{'contents'}->[0]->{'text'};
-            # NB $node_line_name here is unencoded string, but we only use it
-            # currently for checking for special characters, not for output.
           } else {
             $self->{'silent'} = 0 if (!defined($self->{'silent'}));
             $self->{'silent'}++;
@@ -2480,7 +2478,7 @@ sub _convert($$)
                                           {'type' => '_code',
                                            'contents' => [$label_element]},
                                           {'suppress_styles' => 1,
-                                            'no_added_eol' => 1});
+                                            'no_added_eol' => 1}, undef, 1);
             $self->{'silent'}--;
           }
 
@@ -2973,8 +2971,8 @@ sub _convert($$)
           $prepended->{'type'} = 'frenchspacing';
           #_convert($self, $prepended);
           my ($converted, $width, $extra_lines)
-            = $self->convert_line_new_context($prepended);
-          _stream_output_encoded($self, $converted);
+            = $self->convert_line_new_context($prepended, undef, 1);
+          _stream_output($self, undef, $converted);
           $self->{'count_context'}->[-1]->{'lines'} += $extra_lines;
 
           $self->{'text_element_context'}->[-1]->{'counter'} += $width;
@@ -4048,8 +4046,8 @@ sub _convert($$)
         if ($prepended) {
           $prepended->{'type'} = 'frenchspacing';
           my ($float_number, $columns)
-            = $self->convert_line_new_context ($prepended);
-          _stream_output_encoded($self, $float_number);
+            = $self->convert_line_new_context ($prepended, undef, 1);
+          _stream_output($self, undef, $float_number);
 
           $self->{'text_element_context'}->[-1]->{'counter'} += $columns;
         }