branch master updated: * tp/Texinfo/XS/convert/converter.c (converter_converter), tp/Texinfo/XS/convert/texinfo.c (txi_converter_setup): call converter_initialize in converter_converter again. Adapt txi_converter_setup.

[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 029ddba7f4 * tp/Texinfo/XS/convert/converter.c (converter_converter), 
tp/Texinfo/XS/convert/texinfo.c (txi_converter_setup): call 
converter_initialize in converter_converter again.  Adapt txi_converter_setup.
029ddba7f4 is described below

commit 029ddba7f4173775511c8f061da191876e40db3b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Oct 28 09:58:29 2024 +0100

    * tp/Texinfo/XS/convert/converter.c (converter_converter),
    tp/Texinfo/XS/convert/texinfo.c (txi_converter_setup): call
    converter_initialize in converter_converter again.  Adapt
    txi_converter_setup.
---
 ChangeLog                         |  7 +++++++
 tp/Texinfo/XS/convert/converter.c | 10 +++-------
 tp/Texinfo/XS/convert/texinfo.c   | 13 ++++++-------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a088ab3812..4ce0008dcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-10-28  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/converter.c (converter_converter),
+       tp/Texinfo/XS/convert/texinfo.c (txi_converter_setup): call
+       converter_initialize in converter_converter again.  Adapt
+       txi_converter_setup.
+
 2024-10-28  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/converter.c
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index 39b095b178..1142d01cff 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -439,13 +439,7 @@ converter_initialize (CONVERTER *converter)
     }
 }
 
-/* Texinfo::Convert::XXXX->converter($conf) in Perl, except for the call
-   to converter_initialize. */
-/* FIXME should it contain converter_initialize?  It does not to be able
-   to set TEXINFO_LANGUAGE_DIRECTORIES after set_converter_init_information
-   call to be able to check if TEST customization option is set.  This seems
-   too different from the logic used in Perl where customisation variables
-   are available very early, in texi2any.pl */
+/* Texinfo::Convert::XXXX->converter($conf) in Perl */
 /* only called from C, not from Perl */
 CONVERTER *
 converter_converter (enum converter_format format,
@@ -469,6 +463,8 @@ converter_converter (enum converter_format format,
 
   destroy_converter_initialization_info (user_conf);
 
+  converter_initialize (converter);
+
   return converter;
 }
 
diff --git a/tp/Texinfo/XS/convert/texinfo.c b/tp/Texinfo/XS/convert/texinfo.c
index fd152a3e13..2c5df883a1 100644
--- a/tp/Texinfo/XS/convert/texinfo.c
+++ b/tp/Texinfo/XS/convert/texinfo.c
@@ -387,9 +387,8 @@ txi_converter_setup (const char *format_str,
       copy_options_list (&conf->conf, customizations);
     }
 
-  self = converter_converter (converter_format, conf);
-
-  if (!self->conf->TEST.o.integer && conversion_paths_info.texinfo_uninstalled
+  if (conf->conf.options->TEST.o.integer <= 0
+      && conversion_paths_info.texinfo_uninstalled
       && conversion_paths_info.p.uninstalled.top_srcdir)
     {
       char *in_source_util_dir;
@@ -399,14 +398,14 @@ txi_converter_setup (const char *format_str,
       free (in_source_util_dir);
     }
 
-  copy_strings (self->conf->TEXINFO_LANGUAGE_DIRECTORIES.o.strlist,
-                texinfo_language_config_dirs);
+  add_option_strlist_value (&conf->conf, "TEXINFO_LANGUAGE_DIRECTORIES",
+                            texinfo_language_config_dirs);
 
   destroy_strings_list (texinfo_language_config_dirs);
 
-  destroy_converter_initialization_info (conf);
+  self = converter_converter (converter_format, conf);
 
-  converter_initialize (self);
+  destroy_converter_initialization_info (conf);
 
   return self;
 }