[no subject]

[Patrice Dumas]

branch: master
commit a2cafb02a0e46adcde05a5dfb32fdfef3777d526
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jul 22 14:07:09 2024 +0200

    * tp/Texinfo/Convert/HTML.pm (%XS_conversion_overrides)
    (conversion_initialization), tp/Texinfo/XS/convert/ConvertXS.xs:
    merge _initialize_output_state in conversion_initialization in Perl.
    Remvoe _initialize_output_state override and remove
    html_initialize_output_state from ConvertXS.xs.
---
 ChangeLog                          |  8 ++++++++
 tp/Texinfo/Convert/HTML.pm         | 40 ++++++++++++++------------------------
 tp/Texinfo/XS/convert/ConvertXS.xs | 38 ------------------------------------
 3 files changed, 23 insertions(+), 63 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a6aca6ff30..697885548e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
        Update test results
 
+2024-07-22  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (%XS_conversion_overrides)
+       (conversion_initialization), tp/Texinfo/XS/convert/ConvertXS.xs:
+       merge _initialize_output_state in conversion_initialization in Perl.
+       Remvoe _initialize_output_state override and remove
+       html_initialize_output_state from ConvertXS.xs.
+
 2024-07-22  Patrice Dumas  <pertusus@free.fr>
 
        XS override for HTML::conversion_initialization
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index d0bfb4b185..e18e54309e 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -107,8 +107,6 @@ my %XS_conversion_overrides = (
    => "Texinfo::Convert::ConvertXS::html_converter_initialize_sv",
   "Texinfo::Convert::HTML::conversion_initialization"
    => "Texinfo::Convert::ConvertXS::html_conversion_initialization",
-  "Texinfo::Convert::HTML::_initialize_output_state"
-   => "Texinfo::Convert::ConvertXS::html_initialize_output_state",
   "Texinfo::Convert::HTML::_init_output"
    => "Texinfo::Convert::ConvertXS::html_init_output",
   "Texinfo::Convert::HTML::conversion_finalization"
@@ -12194,11 +12192,24 @@ sub _has_contents_or_shortcontents($)
 # needs to be called from a converter which would have had this function
 # called already.
 
-# This function initializes states that are initialized either in XS or in perl
-sub _initialize_output_state($$)
+# This function initializes states that are initialized either in XS
+# or in Perl.  Called as early as possible in the conversion functions.
+# $CONTEXT is the first conversion context name.
+# $DOCUMENT is the converted Texinfo parsed document.
+sub conversion_initialization($$;$)
 {
   my $self = shift;
   my $context = shift;
+  my $document = shift;
+
+  $self->{'converter_info'} = {};
+
+  if ($document) {
+    $self->set_document($document);
+    $self->{'converter_info'}->{'document'} = $document;
+  }
+
+  $self->{'shared_conversion_state'} = {};
 
   $self->{'document_context'} = [];
 
@@ -12479,27 +12490,6 @@ sub _initialize_output_state($$)
   $self->_new_document_context($context);
 }
 
-# This function initializes states that are initialized both in XS and
-# in perl.  Called as early as possible in the conversion functions.
-# $DOCUMENT is the converted Texinfo parsed document.
-sub conversion_initialization($$;$)
-{
-  my $self = shift;
-  my $context = shift;
-  my $document = shift;
-
-  $self->{'converter_info'} = {};
-
-  if ($document) {
-    $self->set_document($document);
-    $self->{'converter_info'}->{'document'} = $document;
-  }
-
-  $self->{'shared_conversion_state'} = {};
-
-  $self->_initialize_output_state($context);
-}
-
 sub conversion_finalization($)
 {
   my $self = shift;
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 8e33313ba7..fd2a972f19 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -608,44 +608,6 @@ html_conversion_initialization (SV *converter_in, const 
char *context, SV *docum
                 }
             }
 
-
-void
-html_initialize_output_state (SV *converter_in, const char *context)
-      PREINIT:
-         CONVERTER *self;
-      CODE:
-         self = get_sv_converter (converter_in, 
"html_initialize_output_state");
-         if (self)
-           {
-             HV *converter_hv = (HV *) SvRV (converter_in);
-
-             html_initialize_output_state (self, context);
-             /* could be useful if something from Perl is needed
-             html_conversion_initialization_sv (converter_in, self);
-              */
-
-             /* internal links code is in Perl */
-             if (self->conf->INTERNAL_LINKS.o.string)
-               self->external_references_number++;
-             /* Conversion to LaTeX is in Perl */
-             if (self->conf->CONVERT_TO_LATEX_IN_MATH.o.integer > 0)
-               self->external_references_number++;
-
-             if (self->conf->CONVERT_TO_LATEX_IN_MATH.o.integer > 0)
-               {
-                 HV *options_latex_math_hv =
-                 latex_build_options_for_convert_to_latex_math (self);
-                 hv_store (converter_hv, "options_latex_math",
-                           strlen ("options_latex_math"),
-                           newRV_noinc ((SV *)options_latex_math_hv), 0);
-               }
-
-             if (self->external_references_number > 0)
-               {
-                 html_pass_converter_output_state (self, converter_in, 0);
-               }
-           }
-
 SV *
 html_init_output (SV *converter_in)
       PREINIT: