branch master updated: * Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm, Pod-Simple-Texinfo/pod2texi.pl: update for the move of functions to Texinfo::Document.

[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 7409dbdf5f * Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm, 
Pod-Simple-Texinfo/pod2texi.pl: update for the move of functions to 
Texinfo::Document.
7409dbdf5f is described below

commit 7409dbdf5fd7ea18fc230c7c8322533e11a389a0
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Nov 14 10:56:09 2023 +0100

    * Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm,
    Pod-Simple-Texinfo/pod2texi.pl: update for the move of functions to
    Texinfo::Document.
---
 ChangeLog                                    |  6 ++++++
 Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm | 13 +++++++------
 Pod-Simple-Texinfo/pod2texi.pl               |  8 ++++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 572ac4ddd7..05088870ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-11-14  Patrice Dumas  <pertusus@free.fr>
+
+       * Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm,
+       Pod-Simple-Texinfo/pod2texi.pl: update for the move of functions to
+       Texinfo::Document.
+
 2023-11-14  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/DocumentXS.xs (rebuild_document, rebuild_tree)
diff --git a/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm 
b/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm
index f315153176..000b44b571 100644
--- a/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm
+++ b/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm
@@ -54,6 +54,7 @@ use Texinfo::Convert::Texinfo;
 use Texinfo::Convert::TextContent;
 use Texinfo::Common qw(protect_colon_in_tree protect_comma_in_tree
                                          protect_first_parenthesis);
+use Texinfo::Document;
 use Texinfo::Transformations qw(protect_hashchar_at_line_beginning
                                           reference_to_arg_in_tree);
 
@@ -354,7 +355,7 @@ sub _protect_comma($)
   my $texinfo = shift;
   my $tree = parse_texi_line(undef, $texinfo);
   $tree = protect_comma_in_tree($tree);
-  $tree = Texinfo::Structuring::rebuild_tree($tree);
+  $tree = Texinfo::Document::rebuild_tree($tree);
   return Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
 }
 
@@ -363,7 +364,7 @@ sub _protect_colon($)
   my $texinfo = shift;
   my $tree = parse_texi_line(undef, $texinfo);
   $tree = protect_colon_in_tree($tree);
-  $tree = Texinfo::Structuring::rebuild_tree($tree);
+  $tree = Texinfo::Document::rebuild_tree($tree);
   return Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
 }
 
@@ -376,7 +377,7 @@ sub _protect_hashchar($)
     my $document = parse_texi_text(undef, $texinfo);
     my $tree = $document->tree();
     protect_hashchar_at_line_beginning($tree);
-    $tree = Texinfo::Structuring::rebuild_tree($tree);
+    $tree = Texinfo::Document::rebuild_tree($tree);
     return Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
   } else {
     return $texinfo;
@@ -390,7 +391,7 @@ sub _reference_to_text_in_texi($)
   my $document = parse_texi_text(undef, $texinfo);
   my $tree = $document->tree();
   reference_to_arg_in_tree($tree);
-  $tree = Texinfo::Structuring::rebuild_tree($tree);
+  $tree = Texinfo::Document::rebuild_tree($tree);
   return Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
 }
 
@@ -448,7 +449,7 @@ sub _normalize_texinfo_name($$)
   my $tree = $document->tree();
   if ($command eq 'anchor') {
     Texinfo::Transformations::protect_first_parenthesis_in_targets($tree);
-    $tree = Texinfo::Structuring::rebuild_tree($tree);
+    $tree = Texinfo::Document::rebuild_tree($tree);
   }
   my $fixed_text = Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
   my $result = $fixed_text;
@@ -501,7 +502,7 @@ sub _prepare_anchor($$)
   }
   $node_tree = protect_comma_in_tree($node_tree);
   $node_tree = protect_colon_in_tree($node_tree);
-  $node_tree = Texinfo::Structuring::rebuild_tree($node_tree);
+  $node_tree = Texinfo::Document::rebuild_tree($node_tree);
   $self->{'texinfo_nodes'}->{$normalized} = $node_tree;
   my $final_node_name = 
Texinfo::Convert::Texinfo::convert_to_texinfo($node_tree);
   return $final_node_name;
diff --git a/Pod-Simple-Texinfo/pod2texi.pl b/Pod-Simple-Texinfo/pod2texi.pl
index b92636f0b3..f4531f784a 100755
--- a/Pod-Simple-Texinfo/pod2texi.pl
+++ b/Pod-Simple-Texinfo/pod2texi.pl
@@ -97,6 +97,10 @@ BEGIN
 use Pod::Simple::Texinfo;
 use Texinfo::Common;
 use Texinfo::Parser;
+use Texinfo::Convert::Texinfo;
+use Texinfo::Convert::NodeNameNormalization;
+use Texinfo::Document;
+use Texinfo::Structuring;
 use Texinfo::Transformations;
 
 {
@@ -299,7 +303,7 @@ sub _parsed_manual_tree($$$$$)
       my $added_nodes
         = Texinfo::Transformations::insert_nodes_for_sectioning_commands(
                                            $document, $registrar, 
$texi_parser);
-      $document = Texinfo::Structuring::rebuild_document($document);
+      $document = Texinfo::Document::rebuild_document($document);
       if ($self and $self->texinfo_sectioning_base_level() > 0) {
         # prepend the manual name
         foreach my $node (@$added_nodes) {
@@ -390,7 +394,7 @@ sub _fix_texinfo_tree($$$$;$$)
       }
     }
   }
-  $document = Texinfo::Structuring::rebuild_document($document);
+  $document = Texinfo::Document::rebuild_document($document);
   return ($texi_parser, $document);
 }