branch master updated: * tp/Texinfo/Convert/Converter.pm (write_or_return) tp/DebugTexinfo/DebugTree.pm, tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/TexinfoXML.pm: rename _output_text() as write_or_return().

[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 3af72ee  * tp/Texinfo/Convert/Converter.pm (write_or_return) 
tp/DebugTexinfo/DebugTree.pm, tp/Texinfo/Convert/DocBook.pm, 
tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/IXIN.pm, 
tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/TexinfoXML.pm: rename 
_output_text() as write_or_return().
3af72ee is described below

commit 3af72eec415fdc013a41e921eb6896c0087c1dd3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Sep 7 23:29:25 2021 +0200

    * tp/Texinfo/Convert/Converter.pm (write_or_return)
    tp/DebugTexinfo/DebugTree.pm, tp/Texinfo/Convert/DocBook.pm,
    tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/IXIN.pm,
    tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/TexinfoXML.pm:
    rename _output_text() as write_or_return().
---
 ChangeLog                        |  8 ++++++++
 tp/DebugTexinfo/DebugTree.pm     |  2 +-
 tp/Texinfo/Convert/Converter.pm  | 10 +++++-----
 tp/Texinfo/Convert/DocBook.pm    |  4 ++--
 tp/Texinfo/Convert/HTML.pm       |  6 +++---
 tp/Texinfo/Convert/IXIN.pm       | 20 ++++++++++----------
 tp/Texinfo/Convert/LaTeX.pm      |  6 +++---
 tp/Texinfo/Convert/TexinfoXML.pm |  4 ++--
 8 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e5db3a7..4365805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2021-09-07  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Convert/Converter.pm (write_or_return)
+       tp/DebugTexinfo/DebugTree.pm, tp/Texinfo/Convert/DocBook.pm,
+       tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/IXIN.pm,
+       tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/TexinfoXML.pm:
+       rename _output_text() as write_or_return().
+
+2021-09-07  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Convert/Converter.pm (top_node_filename),
        tp/Texinfo/Convert/HTML.pm: rename _top_node_filename()
        as top_node_filename().
diff --git a/tp/DebugTexinfo/DebugTree.pm b/tp/DebugTexinfo/DebugTree.pm
index aeeeade..415cfc5 100644
--- a/tp/DebugTexinfo/DebugTree.pm
+++ b/tp/DebugTexinfo/DebugTree.pm
@@ -95,7 +95,7 @@ sub output($$)
     $root = {'type' => 'elements_root',
              'contents' => $elements };
   }
-  return $self->_output_text (_print_tree($self, $root), $fh);
+  return $self->write_or_return(_print_tree($self, $root), $fh);
 }
 
 sub convert($$)
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index ba7cccd..8d5bd35 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -806,10 +806,10 @@ sub output($$)
     if ($elements and @$elements) {
       foreach my $element (@$elements) {
         my $element_text = $self->convert_tree($element);
-        $output .= $self->_output_text($element_text, $fh);
+        $output .= $self->write_or_return($element_text, $fh);
       }
     } else {
-      $output .= $self->_output_text($self->convert($root), $fh);
+      $output .= $self->write_or_return($self->convert($root), $fh);
     }
     # NOTE do not close STDOUT now to avoid a perl warning.
     if ($fh and $outfile ne '-') {
@@ -1242,7 +1242,7 @@ sub output_no_split($$)
 }
 
 # output fo $fh if defined, otherwise return the text.
-sub _output_text($$$)
+sub write_or_return($$$)
 {
   my $self = shift;
   my $text = shift;
@@ -1265,11 +1265,11 @@ sub _convert_document_elements($$;$$)
   if ($elements) {
     my $result = '';
     foreach my $element (@$elements) {
-      $result .= $self->_output_text($self->convert_tree($element), $fh);
+      $result .= $self->write_or_return($self->convert_tree($element), $fh);
     }
     return $result;
   } else {
-    return $self->_output_text($self->convert_tree($root), $fh);
+    return $self->write_or_return($self->convert_tree($root), $fh);
   }
 }
 
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index aad124e..301a332 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -350,9 +350,9 @@ sub output($$)
 '. "<book${id} lang=\"$lang\">\n";
 
   my $result = '';
-  $result .= $self->_output_text($header, $fh);
+  $result .= $self->write_or_return($header, $fh);
   $result .= $self->convert_document_sections($root, $fh);
-  $result .= $self->_output_text("</book>\n", $fh);
+  $result .= $self->write_or_return("</book>\n", $fh);
   if ($fh and $output_file ne '-') {
     Texinfo::Common::output_files_register_closed(
                   $self->output_files_information(), $output_file);
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index f591344..7e626fb 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -7626,9 +7626,9 @@ sub output($$)
     }
 
     my $header = &{$self->{'format_begin_file'}}($self, $output_filename, 
undef);
-    $output .= $self->_output_text($header, $fh);
-    $output .= $self->_output_text($body, $fh);
-    $output .= $self->_output_text(&{$self->{'format_end_file'}}($self), $fh);
+    $output .= $self->write_or_return($header, $fh);
+    $output .= $self->write_or_return($body, $fh);
+    $output .= $self->write_or_return(&{$self->{'format_end_file'}}($self), 
$fh);
 
     # NOTE do not close STDOUT now to avoid a perl warning.
     if ($fh and $outfile ne '-') {
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index 1987d66..3894ca4 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -885,23 +885,23 @@ sub output_ixin($$)
                     'labelslen', $self->_count_bytes($labels_text),
                     'blobsindexlen', $self->_count_bytes($blobs_index));
 
-  my $output = $self->_output_text($result, $fh);
+  my $output = $self->write_or_return($result, $fh);
 
   my $counts_text = $self->ixin_open_element('counts', \@counts_attributes);
   $counts_text .= $dts_index;
   $counts_text .= $floats_index;
   $counts_text .= $self->ixin_close_element('counts') . "\n";
-  $output .= $self->_output_text($counts_text, $fh);
+  $output .= $self->write_or_return($counts_text, $fh);
 
-  $output .= $self->_output_text($nodes_index, $fh);
-  $output .= $self->_output_text($sectioning_tree, $fh);
-  $output .= $self->_output_text($labels_text, $fh);
-  $output .= $self->_output_text($dts_text, $fh);
-  $output .= $self->_output_text($floats_text, $fh);
-  $output .= $self->_output_text($blobs_index, $fh);
+  $output .= $self->write_or_return($nodes_index, $fh);
+  $output .= $self->write_or_return($sectioning_tree, $fh);
+  $output .= $self->write_or_return($labels_text, $fh);
+  $output .= $self->write_or_return($dts_text, $fh);
+  $output .= $self->write_or_return($floats_text, $fh);
+  $output .= $self->write_or_return($blobs_index, $fh);
 
-  $output .= $self->_output_text($document_output, $fh);
-  $output .= $self->_output_text($blobs, $fh);
+  $output .= $self->write_or_return($document_output, $fh);
+  $output .= $self->write_or_return($blobs, $fh);
 
   if ($fh and $output_file ne '-') {
     Texinfo::Common::output_files_register_closed(
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 37b86ce..9515dba 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -958,10 +958,10 @@ sub output($$)
 
   $self->_prepare_conversion($modified_top_root);
 
-  $result .= $self->_output_text($self->_latex_header(), $fh);
+  $result .= $self->write_or_return($self->_latex_header(), $fh);
   _push_new_context($self, 'main');
-  $result .= $self->_output_text($self->convert_tree($modified_top_root), $fh);
-  $result .= $self->_output_text($self->_latex_footer(), $fh);
+  $result .= $self->write_or_return($self->convert_tree($modified_top_root), 
$fh);
+  $result .= $self->write_or_return($self->_latex_footer(), $fh);
 
   #print $result;
   if ($fh and $output_file ne '-') {
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 5381eb4..e9d8573 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -463,14 +463,14 @@ sub output($$)
   }
 
   my $result = '';
-  $result .= $self->_output_text(
+  $result .= $self->write_or_return(
        $self->format_header($output_file, $output_filename), $fh);
   if ($self->get_conf('USE_NODES')) {
     $result .= $self->convert_document_nodes($root, $fh);
   } else {
     $result .= $self->convert_document_sections($root, $fh);
   }
-  $result .= $self->_output_text($self->close_element('texinfo')."\n", $fh);
+  $result .= $self->write_or_return($self->close_element('texinfo')."\n", $fh);
   if ($fh and $output_file ne '-') {
     Texinfo::Common::output_files_register_closed(
                   $self->output_files_information(), $output_file);