texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Patrice Dumas
Date: Sun, 21 Jan 2024 16:45:12 -0500 (EST)

branch: master
commit c5ebb3cab6fbcb30d5f184f7d8cf1f11ecac381c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jan 21 22:40:09 2024 +0100

    * tp/Texinfo/Transformations.pm (_new_node): call confess if _new_node
    is called with XS.
    
    * tp/t/accents.t: do not set document_descriptor as an option for th
    econverter.
---
 ChangeLog                     | 8 ++++++++
 tp/Texinfo/Document.pm        | 4 ++--
 tp/Texinfo/Transformations.pm | 5 ++---
 tp/t/accents.t                | 3 ---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cedf6b211a..2fa4eeb632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,14 @@
        _add_newline_if_needed to ensure a blank line at the end of
        the header.
 
+2024-01-21  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Transformations.pm (_new_node): call confess if _new_node
+       is called with XS.
+
+       * tp/t/accents.t: do not set document_descriptor as an option for th
+       econverter.
+
 2024-01-21  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/Converter.pm (%common_converters_defaults):
diff --git a/tp/Texinfo/Document.pm b/tp/Texinfo/Document.pm
index 20edbfbaef..69088d6896 100644
--- a/tp/Texinfo/Document.pm
+++ b/tp/Texinfo/Document.pm
@@ -251,7 +251,7 @@ sub _add_element_to_identifiers_target($$;$$)
 # This should be considered an internal function of the parser.
 # It is here to reuse code.
 # Sets $self->{'identifiers_target'} based on $self->{'labels_list'}.
-sub set_labels_identifiers_target ($$$)
+sub set_labels_identifiers_target($$$)
 {
   my $self = shift;
   my $registrar = shift;
@@ -304,7 +304,7 @@ sub register_label_element($$;$$)
 }
 
 # do nothing, only the XS override does something.
-sub remove_document ($)
+sub remove_document($)
 {
   my $document = shift;
 }
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index 31b8d0ec8e..d53694285f 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -28,7 +28,7 @@ use strict;
 #no autovivification qw(fetch delete exists store strict);
 
 
-use Carp qw(cluck);
+use Carp qw(cluck confess);
 
 use Texinfo::StructTransfXS;
 
@@ -307,8 +307,7 @@ sub _new_node($$;$$)
     # protect_first_parenthesis_in_targets.
     # FIXME we could also rebuild the tree, after adding an override
     # for protect_first_parenthesis?
-    print STDERR "FATAL (BUG): _new_node: XS not supported\n";
-    exit (1);
+    confess("BUG: _new_node: XS not supported");
   }
 
   # We protect for all the contexts, as the node name should be
diff --git a/tp/t/accents.t b/tp/t/accents.t
index b522bf9c84..2245767130 100644
--- a/tp/t/accents.t
+++ b/tp/t/accents.t
@@ -103,9 +103,6 @@ sub test_enable_encoding ($)
                                 
\&Texinfo::Convert::Text::ascii_accent_fallback);
 
   my $options = {};
-  if ($root->{'tree_document_descriptor'}) {
-    $options->{'document_descriptor'} = $root->{'tree_document_descriptor'};
-  }
   my $html_converter = Texinfo::Convert::HTML->converter($options);
   # NOTE we use a converter outside of output/convert
   $html_converter->conversion_initialization();



reply via email to

[Prev in Thread] Current Thread [Next in Thread]