[no subject]

[Patrice Dumas]

branch: master
commit 5dcac6698d71726c24494217520e0b3c063c57cd
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Oct 18 19:28:57 2024 +0200

    * tp/Texinfo/XS/convert/texinfo.c (txi_setup),
    tp/Texinfo/XS/teximakehtml.c (main): do not call html_format_setup in
    txi_setup to be output format independent, call in teximakehtml.c.
---
 ChangeLog                       | 6 ++++++
 tp/Texinfo/XS/convert/texinfo.c | 1 -
 tp/Texinfo/XS/teximakehtml.c    | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 79ec76bfd9..495c15b60c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,12 @@
 
        (Reverted commit dated 2024-07-28 10:45:10, applied 2024-10-01.)
 
+2024-10-18  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/texinfo.c (txi_setup),
+       tp/Texinfo/XS/teximakehtml.c (main): do not call html_format_setup in
+       txi_setup to be output format independent, call in teximakehtml.c.
+
 2024-10-18  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (%XS_conversion_overrides): reorder code.
diff --git a/tp/Texinfo/XS/convert/texinfo.c b/tp/Texinfo/XS/convert/texinfo.c
index 0fa96bcfb3..de01e510f1 100644
--- a/tp/Texinfo/XS/convert/texinfo.c
+++ b/tp/Texinfo/XS/convert/texinfo.c
@@ -55,7 +55,6 @@ txi_setup (const char *localesdir, int texinfo_uninstalled,
 
   converter_setup (texinfo_uninstalled, tp_builddir,
                    converterdatadir, top_srcdir);
-  html_format_setup ();
 }
 
 /* parser initialization, similar to Texinfo::Parser::parser in Perl.
diff --git a/tp/Texinfo/XS/teximakehtml.c b/tp/Texinfo/XS/teximakehtml.c
index 7ed1dbe75b..8bce3e8c8e 100644
--- a/tp/Texinfo/XS/teximakehtml.c
+++ b/tp/Texinfo/XS/teximakehtml.c
@@ -38,6 +38,8 @@
 #include "convert_to_texinfo.h"
  */
 #include "create_buttons.h"
+/* for html_format_setup */
+#include "html_converter_api.h"
 #include "texinfo.h"
 
 #define LOCALEDIR DATADIR "/locale"
@@ -260,6 +262,7 @@ main (int argc, char *argv[])
     = txi_handle_document_error_messages (document, 0, 1, locale_encoding);
   errors_count += errors_nr;
 
+  html_format_setup ();
 
   /* conversion initialization */
   initialize_options_list (&convert_options, 2);