branch master updated: * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command): use extra "spaces_after_argument" instead of type spaces_at_end for an equivalent command replacing a @set.

[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 0ae6ed2431 * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line), 
tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command): use extra 
"spaces_after_argument" instead of type spaces_at_end for an equivalent command 
replacing a @set.
0ae6ed2431 is described below

commit 0ae6ed2431cbaded37bfadb248d16768ba4fe5f8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Sep 10 23:33:36 2022 +0200

    * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
    tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command):
    use extra "spaces_after_argument" instead of type spaces_at_end
    for an equivalent command replacing a @set.
---
 ChangeLog                                         |  7 +++++++
 tp/Texinfo/ParserNonXS.pm                         | 11 +++++------
 tp/Texinfo/XS/parsetexi/handle_commands.c         |  7 ++-----
 tp/t/results/value/set_flag_command_equivalent.pl | 22 ++++++++--------------
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b735abd90..625c27ca8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-09-10  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
+       tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command):
+       use extra "spaces_after_argument" instead of type spaces_at_end
+       for an equivalent command replacing a @set.
+
 2022-09-10  Patrice Dumas  <pertusus@free.fr>
 
        Remove empty_spaces_after_command. Remove empty_spaces_before_argument
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index c85e12ae8c..4228b2ddd2 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4731,17 +4731,16 @@ sub _process_remaining_on_line($$$$)
           $misc = {'cmdname' => $command,
                    'parent' => $current,
                    'source_info' => $source_info,
-                   'extra' => {'misc_args' => [$arg]}};
+                   'extra' => {'misc_args' => [$arg],
+                               'spaces_before_argument' => ' '}};
           my $misc_line_args = {'type' => 'line_arg',
-                 'parent' => $misc};
+                 'parent' => $misc,
+                 'extra' => {'spaces_after_argument' => "\n"}};
           $misc->{'args'} = [$misc_line_args];
-          $misc->{'extra'}->{'spaces_before_argument'} = ' ';
           $misc_line_args->{'contents'} = [
             { 'text' => $arg,
               'parent' => $misc_line_args, },
-            { 'text' => "\n",
-              'parent' => $misc_line_args,
-              'type' => 'spaces_at_end', } ];
+          ];
           push @{$current->{'contents'}}, $misc;
         } else {
           if (!$ignored) {
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c 
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index b02254df49..2533d67ee9 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -389,17 +389,14 @@ handle_line_command (ELEMENT *current, char **line_inout,
           line_args = new_element (ET_line_arg);
           add_to_element_args (misc, line_args);
           add_extra_misc_args (misc, "misc_args", args);
-
           add_extra_string_dup (misc, "spaces_before_argument", " ");
 
+          add_extra_string_dup (line_args, "spaces_after_argument", "\n");
+
           e = new_element (ET_NONE);
           text_append (&e->text, arg);
           add_to_element_contents (line_args, e);
 
-          e = new_element (ET_spaces_at_end);
-          text_append_n (&e->text, "\n", 1);
-          add_to_element_contents (line_args, e);
-
           add_to_element_contents (current, misc);
         }
       else
diff --git a/tp/t/results/value/set_flag_command_equivalent.pl 
b/tp/t/results/value/set_flag_command_equivalent.pl
index 36351acbd3..e7fe9e8f2a 100644
--- a/tp/t/results/value/set_flag_command_equivalent.pl
+++ b/tp/t/results/value/set_flag_command_equivalent.pl
@@ -16,14 +16,12 @@ $result_trees{'set_flag_command_equivalent'} = {
                 {
                   'parent' => {},
                   'text' => 'on'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
-',
-                  'type' => 'spaces_at_end'
                 }
               ],
+              'extra' => {
+                'spaces_after_argument' => '
+'
+              },
               'parent' => {},
               'type' => 'line_arg'
             }
@@ -72,14 +70,12 @@ $result_trees{'set_flag_command_equivalent'} = {
                 {
                   'parent' => {},
                   'text' => 'off'
-                },
-                {
-                  'parent' => {},
-                  'text' => '
-',
-                  'type' => 'spaces_at_end'
                 }
               ],
+              'extra' => {
+                'spaces_after_argument' => '
+'
+              },
               'parent' => {},
               'type' => 'line_arg'
             }
@@ -106,7 +102,6 @@ $result_trees{'set_flag_command_equivalent'} = {
   'type' => 'document_root'
 };
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0];
@@ -114,7 +109,6 @@ 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[2]{'cont
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0];
 $result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'parent'} = 
$result_trees{'set_flag_command_equivalent'};