[no subject]

[Patrice Dumas]

branch: master
commit b75dc12df5c63b1030b3bc3f3adc58d2456c7a89
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Oct 23 14:05:00 2024 +0200

    * tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
    (convert_to_texinfo_internal): use elt_info_number and elt_info
    content being set to determine if the elt_info element should be
    output instead of flags.
---
 ChangeLog                               | 7 +++++++
 tp/Texinfo/XS/main/convert_to_texinfo.c | 9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 95396bb087..c46a57a516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-10-23  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
+       (convert_to_texinfo_internal): use elt_info_number and elt_info
+       content being set to determine if the elt_info element should be
+       output instead of flags.
+
 2024-10-23  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/build_perl_info.c (store_info_string)
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c 
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 888b0888f5..7bea9a819a 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -56,14 +56,15 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
       ADD("@");  ADD(cmdname);
     }
 
-  if (type_data[e->type].flags & TF_braces)
+  if (type_data[e->type].elt_info_number > eit_spaces_after_cmd_before_arg)
     {
       elt = e->elt_info[eit_spaces_after_cmd_before_arg];
       if (elt)
         ADD((char *)elt->e.text->text);
     }
 
-  if (type_data[e->type].flags & TF_spaces_before)
+  if (type_data[e->type].elt_info_number > eit_spaces_before_argument
+      && e->elt_info[eit_spaces_before_argument])
     {
       spc_before_arg = e->elt_info[eit_spaces_before_argument];
     }
@@ -164,7 +165,7 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT *result)
           if (e->type == ET_bracketed_arg
               || e->type == ET_bracketed_linemacro_arg)
             ADD("{");
-          if (type_data[e->type].flags & TF_spaces_before)
+          if (type_data[e->type].elt_info_number > eit_spaces_before_argument)
             {
               elt = e->elt_info[eit_spaces_before_argument];
               if (elt)
@@ -178,7 +179,7 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT *result)
             convert_to_texinfo_internal (e->e.c->contents.list[i], result);
         }
 
-      if (type_data[e->type].flags & TF_spaces_after)
+      if (type_data[e->type].elt_info_number > eit_spaces_after_argument)
         {
           elt = e->elt_info[eit_spaces_after_argument];
           if (elt)