branch master updated: * tp/Texinfo/XS/convert/convert_html.c (convert_to_html_internal): types not known in Perl cannot be set to ignored as types in Perl, so consider only their ignored status as commands.

[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 27a3ae7df5 * tp/Texinfo/XS/convert/convert_html.c 
(convert_to_html_internal): types not known in Perl cannot be set to ignored as 
types in Perl, so consider only their ignored status as commands.
27a3ae7df5 is described below

commit 27a3ae7df57a60518e7320696ac97dc31e36b31d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jun 23 00:46:21 2024 +0200

    * tp/Texinfo/XS/convert/convert_html.c (convert_to_html_internal):
    types not known in Perl cannot be set to ignored as types in Perl, so
    consider only their ignored status as commands.
---
 ChangeLog                            |  6 ++++++
 tp/Texinfo/XS/convert/convert_html.c | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f9a14cccf..c860fc4f6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
        Update/fix test result
 
+2024-06-22  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/convert_html.c (convert_to_html_internal):
+       types not known in Perl cannot be set to ignored as types in Perl, so
+       consider only their ignored status as commands.
+
 2024-06-22  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (%default_commands_conversion): ignore
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 2e388e5b6c..12598606ff 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -16258,6 +16258,9 @@ command_conversion_external (CONVERTER *self, const 
enum command_id cmd,
   const FORMATTING_REFERENCE *formatting_reference
     = self->current_commands_conversion_function[cmd].formatting_reference;
 
+  /* NOTE it should always be true as in the main loop a formatting
+     function is called only if command_conversion is set, which should
+     not be if formatting_reference status is 0 */
   if (formatting_reference->status > 0)
     call_commands_conversion (self, cmd, formatting_reference,
                               element, args_formatted, content,
@@ -16279,6 +16282,9 @@ type_conversion_external (CONVERTER *self, const enum 
element_type type,
 {
   const FORMATTING_REFERENCE *formatting_reference
     = self->current_types_conversion_function[type].formatting_reference;
+  /* NOTE it should always be true, as in the main loop a formatting
+     function is called only if type_conversion is set, which should not
+     be if formatting_reference status is 0 */
   if (formatting_reference->status > 0)
     call_types_conversion (self, type, formatting_reference,
                            element, content, result);
@@ -18521,6 +18527,7 @@ convert_to_html_internal (CONVERTER *self, const 
ELEMENT *element,
   if (type_data[element->type].flags & TF_text)
     {
       TEXT text_result;
+      /* NOTE C only text types cannot be ignored here */
       if (self->current_types_conversion_function[element->type].status
                                                      == FRS_status_ignored)
         {
@@ -18557,8 +18564,12 @@ convert_to_html_internal (CONVERTER *self, const 
ELEMENT *element,
 
   /* ignored if ignored both as type and command */
   if ((element->type
-       && self->current_types_conversion_function[element->type].status
-                                                     == FRS_status_ignored)
+       && (self->current_types_conversion_function[element->type].status
+                                                     == FRS_status_ignored
+         /* type unknown in Perl */
+           || (type_data[element->type].flags & TF_at_command
+               && element->type != ET_index_entry_command
+               && element->type != ET_definfoenclose_command)))
        && (!cmd
            || self->current_commands_conversion_function[cmd].status
                                                      == FRS_status_ignored))