[no subject]

[Patrice Dumas]

branch: master
commit 54fbd88d2d6bf7714e0d2c54f11fc084e9d8771a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jun 2 19:57:14 2024 +0200

    * tp/Texinfo/XS/main/element_types.txt: remove unused
    space_command_arg.  Reorder.
---
 ChangeLog                            |  5 +++++
 tp/Texinfo/XS/main/element_types.c   |  5 ++---
 tp/Texinfo/XS/main/element_types.h   |  5 ++---
 tp/Texinfo/XS/main/element_types.txt | 21 ++++++++++++++-------
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 14d7ce2dcf..ccab4c8842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
        Update test result
 
+2024-06-01  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/main/element_types.txt: remove unused
+       space_command_arg.  Reorder.
+
 2024-06-01  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (%all_commands), tp/Texinfo/command_data.txt:
diff --git a/tp/Texinfo/XS/main/element_types.c 
b/tp/Texinfo/XS/main/element_types.c
index 977dc4a491..b199880073 100644
--- a/tp/Texinfo/XS/main/element_types.c
+++ b/tp/Texinfo/XS/main/element_types.c
@@ -6,8 +6,6 @@ TYPE_DATA type_data[] = {
 0, 0,
 "command_as_argument", 0,
 "index_entry_command", 0,
-"following_arg", 0,
-"space_command_arg", 0,
 "definfoenclose_command", 0,
 "empty_line", TF_text,
 "raw", TF_text,
@@ -36,6 +34,7 @@ TYPE_DATA type_data[] = {
 "brace_command_context", 0,
 "block_line_arg", 0,
 "line_arg", 0,
+"following_arg", 0,
 "rawline_arg", TF_text,
 "menu_entry", 0,
 "menu_entry_leading_text", TF_text,
@@ -65,7 +64,6 @@ TYPE_DATA type_data[] = {
 "row", 0,
 "balanced_braces", 0,
 "bracketed_arg", 0,
-"bracketed_linemacro_arg", TF_text,
 "def_line_arg", 0,
 "untranslated_def_line_arg", 0,
 "def_category", 0,
@@ -82,6 +80,7 @@ TYPE_DATA type_data[] = {
 "macro_call", 0,
 "rmacro_call", 0,
 "linemacro_call", 0,
+"bracketed_linemacro_arg", TF_text,
 "text", 0,
 "_code", 0,
 "_converted", TF_text,
diff --git a/tp/Texinfo/XS/main/element_types.h 
b/tp/Texinfo/XS/main/element_types.h
index 5330d4ada0..2f303f2402 100644
--- a/tp/Texinfo/XS/main/element_types.h
+++ b/tp/Texinfo/XS/main/element_types.h
@@ -5,8 +5,6 @@ enum element_type {
 ET_NONE,
 ET_command_as_argument,
 ET_index_entry_command,
-ET_following_arg,
-ET_space_command_arg,
 ET_definfoenclose_command,
 ET_empty_line,
 ET_raw,
@@ -35,6 +33,7 @@ ET_brace_command_arg,
 ET_brace_command_context,
 ET_block_line_arg,
 ET_line_arg,
+ET_following_arg,
 ET_rawline_arg,
 ET_menu_entry,
 ET_menu_entry_leading_text,
@@ -64,7 +63,6 @@ ET_multitable_body,
 ET_row,
 ET_balanced_braces,
 ET_bracketed_arg,
-ET_bracketed_linemacro_arg,
 ET_def_line_arg,
 ET_untranslated_def_line_arg,
 ET_def_category,
@@ -81,6 +79,7 @@ ET_elided_brace_command_arg,
 ET_macro_call,
 ET_rmacro_call,
 ET_linemacro_call,
+ET_bracketed_linemacro_arg,
 ET_text,
 ET__code,
 ET__converted,
diff --git a/tp/Texinfo/XS/main/element_types.txt 
b/tp/Texinfo/XS/main/element_types.txt
index 42abd691d9..22abd2cba3 100644
--- a/tp/Texinfo/XS/main/element_types.txt
+++ b/tp/Texinfo/XS/main/element_types.txt
@@ -18,8 +18,6 @@
 # Types for @-commands
 command_as_argument
 index_entry_command
-following_arg
-space_command_arg
 definfoenclose_command
 
 # For text elements
@@ -39,7 +37,7 @@ normal_text                               text
 # In special spaces elements in info, as informative command arguments...
 other_text                                text
 
-# Other special types
+# Containers
 document_root
 root_line
 before_node_section
@@ -50,19 +48,24 @@ preamble_before_content
 paragraph
 preformatted
 rawpreformatted
+
+# @-commands arguments containers
 brace_command_arg
 brace_command_context
 block_line_arg
 line_arg
-rawline_arg                               text
+following_arg
+
+rawline_arg                                text
 
 menu_entry
-menu_entry_leading_text                   text
+menu_entry_leading_text                    text
 menu_entry_name
-menu_entry_separator                      text
+menu_entry_separator                       text
 menu_entry_node
 menu_entry_description
 menu_comment
+
 # Used internally
 internal_menu_star                         text
 internal_spaces_after_command              text
@@ -72,6 +75,8 @@ internal_spaces_after_cmd_before_arg       text
 
 macro_name                                 text
 macro_arg                                  text
+
+# structure of block commands
 before_item
 table_entry
 table_term
@@ -84,9 +89,9 @@ before_defline
 multitable_head
 multitable_body
 row
+
 balanced_braces
 bracketed_arg
-bracketed_linemacro_arg                   text
 
 # container of definition line argument content
 def_line_arg
@@ -118,6 +123,8 @@ macro_call
 rmacro_call
 linemacro_call
 
+bracketed_linemacro_arg                    text
+
 # virtual type not corresponding to a specific element in tree, but
 # used for all the elements that hold text, typically in converters.
 text