branch master updated: * tp/Texinfo/Structuring.pm (new_block_command): do a tree with spaces_after/before_argument instead of text space types.

[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 8ea3e131d7 * tp/Texinfo/Structuring.pm (new_block_command): do a tree 
with spaces_after/before_argument instead of text space types.
8ea3e131d7 is described below

commit 8ea3e131d7f0310f16b5cabf1124b0a59e206ccf
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Sep 7 15:09:31 2022 +0200

    * tp/Texinfo/Structuring.pm (new_block_command): do a tree with
    spaces_after/before_argument instead of text space types.
---
 ChangeLog                 |  5 +++++
 tp/Texinfo/Structuring.pm | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9cc73e4e3a..9bd591377c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-09-07  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Structuring.pm (new_block_command): do a tree with
+       spaces_after/before_argument instead of text space types.
+
 2022-09-05  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/texinfo.tex (\cartouche): Use \vtop instead of \vbox
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index c6153267ca..5416754bdf 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1513,20 +1513,21 @@ sub new_block_command($$$)
   my $command_name = shift;
 
   my $end = {'cmdname' => 'end', 'extra' =>
-                 {'command_argument' => $command_name,
+                 {'spaces_before_argument' => ' ',
+                  'command_argument' => $command_name,
                   'text_arg' => $command_name}};
   push @{$end->{'args'}},
-    {'type' => 'line_arg', 'parent' => $end};
+    {'type' => 'line_arg', 'parent' => $end,
+     'extra' => {'spaces_after_argument' => "\n"}};
   push @{$end->{'args'}->[0]->{'contents'}},
-         ({'text' => $command_name, 'parent' => $end->{'args'}->[0]},
-          {'type' => 'spaces_at_end', 'text' => "\n",
-           'parent' => $end->{'args'}->[0]});
-  $end->{'args'}->[0]->{'extra'} = {'spaces_before_argument' => ' '};
+         {'text' => $command_name, 'parent' => $end->{'args'}->[0]};
   my $new_block = {'cmdname' => $command_name, 'parent' => $parent,
                   'extra'=>{'end_command' => $end}};
-  $new_block->{'contents'} = [{'type' => 'empty_line_after_command',
-                               'text' => "\n"},
-                              @$block_contents, $end];
+  my $block_line_arg = {'type' => 'block_line_arg',
+                        'parent' => $new_block,
+                        'extra' => { 'spaces_after_argument' => "\n",}};
+  $new_block->{'args'} = [$block_line_arg];
+  $new_block->{'contents'} = [@$block_contents, $end];
   foreach my $content (@{$new_block->{'contents'}}) {
     $content->{'parent'} = $new_block;
   }