texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/Converter.pm (_generic_conve


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/Converter.pm (_generic_converter_init), tp/Texinfo/XS/convert/ConvertXS.xs (generic_converter_init): rename _internal_converter_initialize as _generic_converter_init, and XS generic_converter_init as generic_converter_init.
Date: Wed, 02 Oct 2024 17:08:49 -0400

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 e93b2ebc51 * tp/Texinfo/Convert/Converter.pm 
(_generic_converter_init), tp/Texinfo/XS/convert/ConvertXS.xs 
(generic_converter_init): rename _internal_converter_initialize as 
_generic_converter_init, and XS generic_converter_init as 
generic_converter_init.
e93b2ebc51 is described below

commit e93b2ebc5167862cfba11cc2d477572c0f9e8130
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 4 10:45:58 2024 +0200

    * tp/Texinfo/Convert/Converter.pm (_generic_converter_init),
    tp/Texinfo/XS/convert/ConvertXS.xs (generic_converter_init): rename
    _internal_converter_initialize as _generic_converter_init, and XS
    generic_converter_init as generic_converter_init.
---
 ChangeLog                          |  7 +++++++
 tp/Texinfo/Convert/Converter.pm    | 19 +++++++------------
 tp/Texinfo/XS/convert/ConvertXS.xs |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4db2410a6..4618611667 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-08-04  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Converter.pm (_generic_converter_init),
+       tp/Texinfo/XS/convert/ConvertXS.xs (generic_converter_init): rename
+       _internal_converter_initialize as _generic_converter_init, and XS
+       generic_converter_init as generic_converter_init.
+
 2024-08-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/api_to_perl.c (register_perl_data): add
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 207de5d4db..2b215c3339 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -81,8 +81,8 @@ my %XS_overrides = (
    => "Texinfo::Convert::ConvertXS::converter_set_document",
 
   # fully overriden for all the converters
-  "Texinfo::Convert::Converter::_internal_converter_initialize",
-   => "Texinfo::Convert::ConvertXS::converter_initialize",
+  "Texinfo::Convert::Converter::_generic_converter_init",
+   => "Texinfo::Convert::ConvertXS::generic_converter_init",
   "Texinfo::Convert::Converter::get_converter_errors"
    => "Texinfo::Convert::ConvertXS::get_converter_errors",
   "Texinfo::Convert::Converter::converter_line_error"
@@ -266,7 +266,7 @@ sub set_document($$)
 }
 
 # initialization either in generic XS converter or in Perl
-sub _internal_converter_initialize($$$;$)
+sub _generic_converter_init($$$;$)
 {
   my $converter = shift;
   my $class = shift;
@@ -312,9 +312,10 @@ sub _internal_converter_initialize($$$;$)
 
   # used for output files information, to register opened
   # and not closed files.  Accessed through output_files_information()
-  $converter->{'output_files'} = 
Texinfo::Convert::Utils::output_files_initialize();
+  $converter->{'output_files'}
+    = Texinfo::Convert::Utils::output_files_initialize();
 
-  # turn the array to a hash.
+  # setup expanded formats as a hash.
   my $expanded_formats = $converter->{'conf'}->{'EXPANDED_FORMATS'};
   $converter->{'expanded_formats'} = {};
   if (defined($expanded_formats)) {
@@ -339,13 +340,7 @@ sub converter($;$)
   my %format_defaults = $converter->converter_defaults($conf);
 
   # if with XS, XS converter initialization.
-  # NOTE get_conf should not be used before that point, such that the conf is
-  # initialized before it is called for the first time.
-  # NOTE format specific information is not available at this point, such that
-  # some options may not be obtained.  This is the case for HTML for instance.
-  # In particular the special units information need to be known before buttons
-  # information can be passed to C.
-  _internal_converter_initialize($converter, $class, \%format_defaults, $conf);
+  _generic_converter_init($converter, $class, \%format_defaults, $conf);
 
   $converter->converter_initialize();
 
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 61f239de3a..44f0c1bab3 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -90,7 +90,7 @@ init (int texinfo_uninstalled, SV *pkgdatadir_sv, SV 
*tp_builddir_sv, SV *top_sr
         RETVAL
 
 void
-converter_initialize (SV *converter_in, const char *class, SV 
*format_defaults_sv, SV *conf_sv=0)
+generic_converter_init (SV *converter_in, const char *class, SV 
*format_defaults_sv, SV *conf_sv=0)
       PREINIT:
          size_t converter_descriptor;
          CONVERTER *self;



reply via email to

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