[no subject]

[Patrice Dumas]

branch: master
commit 47598c81a965b325b3f9f3c839e760a2f702abe6
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Apr 8 11:00:14 2024 +0200

    * doc/texi2any_api.texi (Command Tree Element Conversion Functions),
    tp/Texinfo/Convert/HTML.pm (_convert_xref_commands, _convert),
    tp/Texinfo/XS/convert/build_html_perl_state.c
    (build_html_command_formatted_args),
    tp/Texinfo/XS/convert/convert_html.c (convert_xref_commands)
    (destroy_args_formatted, convert_to_html_internal),
    tp/Texinfo/XS/main/converter_types.h (HTML_ARG_FORMATTED),
    tp/init/html32.pm: rename tree field in tree element conversion
    formatted argument structure to arg_tree.
---
 ChangeLog                                     | 12 ++++++++++++
 doc/texi2any_api.texi                         |  2 +-
 tp/Texinfo/Convert/HTML.pm                    |  4 ++--
 tp/Texinfo/XS/convert/build_html_perl_state.c |  4 ++--
 tp/Texinfo/XS/convert/convert_html.c          |  6 +++---
 tp/Texinfo/XS/main/converter_types.h          |  2 +-
 tp/init/html32.pm                             |  4 ++--
 7 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d0a9f8f13a..ebf068dc4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-04-08  Patrice Dumas  <pertusus@free.fr>
+
+       * doc/texi2any_api.texi (Command Tree Element Conversion Functions),
+       tp/Texinfo/Convert/HTML.pm (_convert_xref_commands, _convert),
+       tp/Texinfo/XS/convert/build_html_perl_state.c
+       (build_html_command_formatted_args),
+       tp/Texinfo/XS/convert/convert_html.c (convert_xref_commands)
+       (destroy_args_formatted, convert_to_html_internal),
+       tp/Texinfo/XS/main/converter_types.h (HTML_ARG_FORMATTED),
+       tp/init/html32.pm: rename tree field in tree element conversion
+       formatted argument structure to arg_tree.
+
 2024-04-08  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Config.pm: adapt comments and a variable name to being
diff --git a/doc/texi2any_api.texi b/doc/texi2any_api.texi
index 39ee2c3f43..a87d49464f 100644
--- a/doc/texi2any_api.texi
+++ b/doc/texi2any_api.texi
@@ -2793,7 +2793,7 @@ as @code{@@inlineraw} second argument.
 @item string
 In string context. @xref{Init File Expansion Contexts}.
 
-@item tree
+@item arg_tree
 The Texinfo tree element corresponding to the argument.
 @xref{Texinfo Tree Elements in User Defined Functions}.
 
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1cf6ddcd05..1eff90d42a 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -6136,7 +6136,7 @@ sub _convert_xref_commands($$$$)
       } elsif (!$label_element->{'extra'}) {
         $label_element->{'extra'} = {};
       }
-      $label_element->{'extra'}->{'manual_content'} = $file_arg->{'tree'};
+      $label_element->{'extra'}->{'manual_content'} = $file_arg->{'arg_tree'};
     } elsif ($arg_node and $arg_node->{'extra'}
              and $arg_node->{'extra'}->{'manual_content'}) {
       my $manual_content = $arg_node->{'extra'}->{'manual_content'};
@@ -13401,7 +13401,7 @@ sub _convert($$;$)
             # do not have $arg_spec reset to normal, such that their argument
             # is not converted here
             $arg_spec = ['normal'] if (!defined($arg_spec));
-            my $arg_formatted = {'tree' => $arg};
+            my $arg_formatted = {'arg_tree' => $arg};
             foreach my $arg_type (@$arg_spec) {
               my $explanation = "$command_type A[$arg_idx]$arg_type";
               if ($arg_type eq 'normal') {
diff --git a/tp/Texinfo/XS/convert/build_html_perl_state.c 
b/tp/Texinfo/XS/convert/build_html_perl_state.c
index 00d4b91924..dae521f9df 100644
--- a/tp/Texinfo/XS/convert/build_html_perl_state.c
+++ b/tp/Texinfo/XS/convert/build_html_perl_state.c
@@ -444,14 +444,14 @@ build_html_command_formatted_args (const 
HTML_ARGS_FORMATTED *args_formatted)
   for (i = 0; i < args_formatted->number; i++)
     {
       const HTML_ARG_FORMATTED *arg_formatted = &args_formatted->args[i];
-      if (arg_formatted->tree)
+      if (arg_formatted->arg_tree)
         {
           int j;
           HV *arg_formated_hv = newHV ();
           av_push (av, newRV_noinc ((SV *) arg_formated_hv));
 
           hv_store (arg_formated_hv, "tree", strlen ("tree"),
-                    newRV_inc ((SV *) arg_formatted->tree->hv), 0);
+                    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 6b60e5e839..5c896495a8 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -12142,7 +12142,7 @@ convert_xref_commands (CONVERTER *self, const enum 
command_id cmd,
             label_element = new_element (ET_NONE);
           /* TODO would be better to have add_extra_element argument const */
           add_extra_element (label_element, "manual_content",
-                             (ELEMENT *)file_arg->tree);
+                             (ELEMENT *)file_arg->arg_tree);
         }
       else
         {
@@ -17546,7 +17546,7 @@ destroy_args_formatted (HTML_ARGS_FORMATTED 
*args_formatted)
         {
           int j;
           HTML_ARG_FORMATTED *arg_formatted = &args_formatted->args[i];
-          if (arg_formatted->tree)
+          if (arg_formatted->arg_tree)
             {
               for (j = 0; j < AFT_type_raw+1; j++)
                 free (arg_formatted->formatted[j]);
@@ -18079,7 +18079,7 @@ convert_to_html_internal (CONVERTER *self, const 
ELEMENT *element,
                       else
                         arg_flags = F_AFT_normal;
 
-                      arg_formatted->tree = arg;
+                      arg_formatted->arg_tree = arg;
 
                       if (arg_flags & F_AFT_normal)
                         {
diff --git a/tp/Texinfo/XS/main/converter_types.h 
b/tp/Texinfo/XS/main/converter_types.h
index 08d4a12948..d55a1291db 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -540,7 +540,7 @@ typedef struct TYPE_OPEN_FUNCTION {
 } TYPE_OPEN_FUNCTION;
 
 typedef struct HTML_ARG_FORMATTED {
-    const ELEMENT *tree;
+    const ELEMENT *arg_tree;
     char *formatted[AFT_type_raw+1];
 } HTML_ARG_FORMATTED;
 
diff --git a/tp/init/html32.pm b/tp/init/html32.pm
index 59a3caa314..56ec846ed3 100644
--- a/tp/init/html32.pm
+++ b/tp/init/html32.pm
@@ -192,8 +192,8 @@ sub html32_convert_explained_command($$$$)
   my $result;
   if ($with_explanation) {
     $result = $self->convert_tree($self->cdt('{explained_string} 
({explanation})',
-          {'explained_string' => $args->[0]->{'tree'},
-           'explanation' => $args->[1]->{'tree'} }));
+          {'explained_string' => $args->[0]->{'arg_tree'},
+           'explanation' => $args->[1]->{'arg_tree'} }));
   } else {
     $result = $args->[0]->{'normal'};
   }