[no subject]

[Patrice Dumas]

branch: master
commit 6776a6b404b5ab816c0aaba60ecf4e025a851559
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Apr 8 11:20:47 2024 +0200

    * tp/Texinfo/XS/convert/build_html_perl_state.c
    (build_html_command_formatted_args): set arg_tree in perl hash.
    
    * tp/Texinfo/Convert/HTML.pm (_translate_names)
    (_reset_unset_no_arg_commands_formatting_context),
    tp/Texinfo/XS/convert/build_html_perl_state.c
    (build_html_translated_names), tp/Texinfo/XS/convert/convert_html.c
    (html_free_converter, reset_unset_no_arg_commands_formatting_context)
    (html_translate_names), tp/Texinfo/XS/main/converter_types.h
    (HTML_COMMAND_CONVERSION): rename no arg commands tree structure field
    as translated_tree.
---
 ChangeLog                                     | 14 ++++++++++++++
 tp/Texinfo/Convert/HTML.pm                    |  8 ++++----
 tp/Texinfo/XS/convert/build_html_perl_state.c | 21 +++++++++++++--------
 tp/Texinfo/XS/convert/convert_html.c          | 20 +++++++++++---------
 tp/Texinfo/XS/main/converter_types.h          |  2 +-
 5 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ebf068dc4e..0e07e8d8a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-04-08  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/build_html_perl_state.c
+       (build_html_command_formatted_args): set arg_tree in perl hash.
+
+       * tp/Texinfo/Convert/HTML.pm (_translate_names)
+       (_reset_unset_no_arg_commands_formatting_context),
+       tp/Texinfo/XS/convert/build_html_perl_state.c
+       (build_html_translated_names), tp/Texinfo/XS/convert/convert_html.c
+       (html_free_converter, reset_unset_no_arg_commands_formatting_context)
+       (html_translate_names), tp/Texinfo/XS/main/converter_types.h
+       (HTML_COMMAND_CONVERSION): rename no arg commands tree structure field
+       as translated_tree.
+
 2024-04-08  Patrice Dumas  <pertusus@free.fr>
 
        * doc/texi2any_api.texi (Command Tree Element Conversion Functions),
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1eff90d42a..18febc9c36 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2862,8 +2862,8 @@ sub _translate_names($)
             = Texinfo::Convert::Utils::translated_command_tree($self, 
$command);
         }
         if (defined($translated_tree) and $translated_tree ne '') {
-          
$self->{'no_arg_commands_formatting'}->{$command}->{$context}->{'tree'}
-            = $translated_tree;
+          $self->{'no_arg_commands_formatting'}->{$command}
+            ->{$context}->{'translated_tree'} = $translated_tree;
           $translated_commands{$command} = 1;
         }
       }
@@ -8420,10 +8420,10 @@ sub 
_reset_unset_no_arg_commands_formatting_context($$$$;$)
     }
   }
   if ($translate
-      and $no_arg_command_context->{'tree'}
+      and $no_arg_command_context->{'translated_tree'}
       and not defined($no_arg_command_context->{'translated_converted'})) {
     my $translated_tree
-      = $no_arg_command_context->{'tree'};
+      = $no_arg_command_context->{'translated_tree'};
     my $translation_result;
     my $explanation
        = "Translated NO ARG \@$cmdname ctx $reset_context";
diff --git a/tp/Texinfo/XS/convert/build_html_perl_state.c 
b/tp/Texinfo/XS/convert/build_html_perl_state.c
index dae521f9df..96fa930970 100644
--- a/tp/Texinfo/XS/convert/build_html_perl_state.c
+++ b/tp/Texinfo/XS/convert/build_html_perl_state.c
@@ -332,15 +332,20 @@ build_html_translated_names (HV *hv, CONVERTER *converter)
               REPLACE_STR(translated_to_convert)
  #undef REPLACE_STR
 
-              if (no_arg_cmd_context->tree)
+              if (no_arg_cmd_context->translated_tree)
                 {
-                  if (!no_arg_cmd_context->tree->hv)
-                    element_to_perl_hash (no_arg_cmd_context->tree, 1);
-                  hv_store (context_hv, "tree", strlen ("tree"),
-                          newRV_inc ((SV *) no_arg_cmd_context->tree->hv), 0);
+                  ELEMENT *translated_tree
+                    = no_arg_cmd_context->translated_tree;
+                  if (!translated_tree->hv)
+                    element_to_perl_hash (translated_tree, 1);
+                  hv_store (context_hv, "translated_tree",
+                            strlen ("translated_tree"),
+                            newRV_inc ((SV *) translated_tree->hv), 0);
                 }
-              else if (hv_exists (context_hv, "tree", strlen ("tree")))
-                hv_delete (context_hv, "tree", strlen ("tree"), G_DISCARD);
+              else if (hv_exists (context_hv, "translated_tree",
+                                  strlen ("translated_tree")))
+                hv_delete (context_hv, "translated_tree",
+                           strlen ("translated_tree"), G_DISCARD);
             }
         }
 
@@ -450,7 +455,7 @@ build_html_command_formatted_args (const 
HTML_ARGS_FORMATTED *args_formatted)
           HV *arg_formated_hv = newHV ();
           av_push (av, newRV_noinc ((SV *) arg_formated_hv));
 
-          hv_store (arg_formated_hv, "tree", strlen ("tree"),
+          hv_store (arg_formated_hv, "arg_tree", strlen ("arg_tree"),
                     newRV_inc ((SV *) arg_formatted->arg_tree->hv), 0);
 
           for (j = 0; j < AFT_type_raw+1; j++)
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 5c896495a8..aea7124b26 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -17167,8 +17167,8 @@ html_free_converter (CONVERTER *self)
         {
           HTML_COMMAND_CONVERSION *format_spec
                 = &self->html_command_conversion[cmd][cctx];
-          if (cctx == HCC_type_normal && format_spec->tree)
-            destroy_element_and_children (format_spec->tree);
+          if (cctx == HCC_type_normal && format_spec->translated_tree)
+            destroy_element_and_children (format_spec->translated_tree);
           free (format_spec->element);
           free (format_spec->text);
           free (format_spec->translated_converted);
@@ -17298,8 +17298,9 @@ reset_unset_no_arg_commands_formatting_context 
(CONVERTER *self,
               free (no_arg_command_context->text);
               no_arg_command_context->text = strdup (no_arg_ref->text);
             }
-          if (no_arg_ref->tree)
-            no_arg_command_context->tree = no_arg_ref->tree;
+          if (no_arg_ref->translated_tree)
+            no_arg_command_context->translated_tree
+              = no_arg_ref->translated_tree;
           if (no_arg_ref->translated_converted)
             {
               free (no_arg_command_context->translated_converted);
@@ -17316,14 +17317,14 @@ reset_unset_no_arg_commands_formatting_context 
(CONVERTER *self,
     }
 
   if (translate
-      && no_arg_command_context->tree
+      && no_arg_command_context->translated_tree
       && !no_arg_command_context->translated_converted)
     {
       char *translation_result = 0;
       char *explanation;
       char *context;
       ELEMENT *tree_built = 0;
-      ELEMENT *translated_tree = no_arg_command_context->tree;
+      ELEMENT *translated_tree = no_arg_command_context->translated_tree;
       if (self->external_references_number > 0 && !translated_tree->hv)
         {
           add_to_element_list (&self->tree_to_build, translated_tree);
@@ -17498,10 +17499,11 @@ html_translate_names (CONVERTER *self)
                   if (translated_tree)
                     {
                       add_cmd = 1;
-                      if (format_spec->tree)
-                        destroy_element_and_children (format_spec->tree);
+                      if (format_spec->translated_tree)
+                        destroy_element_and_children (
+                                                 format_spec->translated_tree);
 
-                      format_spec->tree = translated_tree;
+                      format_spec->translated_tree = translated_tree;
                     }
                 }
             }
diff --git a/tp/Texinfo/XS/main/converter_types.h 
b/tp/Texinfo/XS/main/converter_types.h
index d55a1291db..4a2000b3f8 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -344,7 +344,7 @@ typedef struct HTML_COMMAND_CONVERSION {
     /* following is only for no arg command formatting */
     int unset;
     char *text;
-    ELEMENT *tree;
+    ELEMENT *translated_tree;
     char *translated_converted;
     char *translated_to_convert;
 } HTML_COMMAND_CONVERSION;