branch master updated: * tp/Texinfo/XS/teximakehtml.c (test_parser_EXPANDED_FORMATS_array) (main): expande @iftex sections in test mode only, by default only expand @ifhtml. Report from Gavin.

[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 7ab671c2f9 * tp/Texinfo/XS/teximakehtml.c 
(test_parser_EXPANDED_FORMATS_array) (main): expande @iftex sections in test 
mode only, by default only expand @ifhtml.  Report from Gavin.
7ab671c2f9 is described below

commit 7ab671c2f973936b37badd9b26c107bd470776cb
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Oct 6 14:55:00 2024 +0200

    * tp/Texinfo/XS/teximakehtml.c (test_parser_EXPANDED_FORMATS_array)
    (main): expande @iftex sections in test mode only, by default only
    expand @ifhtml.  Report from Gavin.
---
 ChangeLog                    |  6 ++++++
 tp/Texinfo/XS/teximakehtml.c | 21 +++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5abaa3983..e836ec99e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-10-06  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/teximakehtml.c (test_parser_EXPANDED_FORMATS_array)
+       (main): expande @iftex sections in test mode only, by default only
+       expand @ifhtml.  Report from Gavin.
+
 2024-10-06  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ManipulateTree.pm (move_index_entries_after_items),
diff --git a/tp/Texinfo/XS/teximakehtml.c b/tp/Texinfo/XS/teximakehtml.c
index 73fc5beffc..16029d4bd8 100644
--- a/tp/Texinfo/XS/teximakehtml.c
+++ b/tp/Texinfo/XS/teximakehtml.c
@@ -81,9 +81,14 @@ static VALUE values_array[] = {
 };
 static const VALUE_LIST values = {1, 1, values_array};
 
-static char *parser_EXPANDED_FORMATS_array[] = {"HTML", "tex"};
+static char *parser_EXPANDED_FORMATS_array[] = {"html"};
 static STRING_LIST parser_EXPANDED_FORMATS
-  = {parser_EXPANDED_FORMATS_array, 2, 2};
+  = {parser_EXPANDED_FORMATS_array, 1, 1};
+
+/* in test mode, also expand @iftex for the sake of testing */
+static char *test_parser_EXPANDED_FORMATS_array[] = {"HTML", "tex"};
+static STRING_LIST test_parser_EXPANDED_FORMATS
+  = {test_parser_EXPANDED_FORMATS_array, 2, 2};
 
 
 int
@@ -206,8 +211,16 @@ main (int argc, char *argv[])
   add_new_option_value (&parser_options, GOT_integer,
                            "DEBUG", 1, 0);
    */
-  add_new_option_strlist_value (&parser_options, GOT_char_string_list,
-                        "EXPANDED_FORMATS", &parser_EXPANDED_FORMATS);
+  if (test)
+    {
+      add_new_option_strlist_value (&parser_options, GOT_char_string_list,
+                        "EXPANDED_FORMATS", &test_parser_EXPANDED_FORMATS);
+    }
+  else
+    {
+      add_new_option_strlist_value (&parser_options, GOT_char_string_list,
+                            "EXPANDED_FORMATS", &parser_EXPANDED_FORMATS);
+    }
 
   /* initialize parser */
   txi_parser (input_file_path, locale_encoding, expanded_formats, &values,