texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: Rename spaces type extra command as spaces_associ


From: Patrice Dumas
Subject: branch master updated: Rename spaces type extra command as spaces_associated_command
Date: Sun, 04 Sep 2022 18:47:18 -0400

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 8a7f1f4068 Rename spaces type extra command as 
spaces_associated_command
8a7f1f4068 is described below

commit 8a7f1f4068d4db1957daa6f778f509f565baeb4e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Sep 5 00:47:05 2022 +0200

    Rename spaces type extra command as spaces_associated_command
    
    * tp/Texinfo/ParserNonXS.pm, tp/Texinfo/XS/parsetexi/parser.c:
    use 'spaces_associated_command' as 'extra' key for spaces
    of 'empty_spaces_before_argument' and 'empty_line_after_command'
    types.
---
 ChangeLog                                          |  9 +++++
 tp/Texinfo/ParserNonXS.pm                          | 24 ++++++-------
 tp/Texinfo/XS/parsetexi/parser.c                   |  4 +--
 tp/Texinfo/XS/parsetexi/separator.c                |  8 ++---
 .../conditionals/empty_ifset_in_ifset_set.pl       |  4 +--
 tp/t/results/conditionals/end_ifset_in_format.pl   |  8 ++---
 tp/t/results/conditionals/ignore_not_closed.pl     |  4 +--
 tp/t/results/conditionals/nested_ignore.pl         | 12 +++----
 .../converters_tests/definition_commands.pl        |  4 +--
 tp/t/results/coverage/item_container.pl            |  4 +--
 tp/t/results/coverage/symbol_after_block.pl        |  8 ++---
 tp/t/results/formatting/texi_bib_example.pl        |  4 +--
 .../verbatim_in_multitable_in_example.pl           | 12 +++----
 tp/t/results/html_tests/xml_protected_in_verb.pl   |  4 +--
 tp/t/results/include/cpp_lines.pl                  |  4 +--
 .../info_tests/nested_multitable_anchor_index.pl   |  4 +--
 tp/t/results/invalid_nestings/center.pl            |  4 +--
 tp/t/results/invalid_nestings/ignore_in_xref.pl    |  4 +--
 tp/t/results/invalid_nestings/in_table.pl          |  4 +--
 .../invalid_nestings/on_block_command_line.pl      |  4 +--
 .../invalid_nestings/on_index_entry_line.pl        |  4 +--
 tp/t/results/invalid_nestings/on_itemize_line.pl   |  4 +--
 tp/t/results/invalid_nestings/on_section_line.pl   |  4 +--
 .../results/invalid_nestings/on_subheading_line.pl |  4 +--
 tp/t/results/invalid_nestings/verbatim_in_ref.pl   |  4 +--
 tp/t/results/itemize/enumerate_and_empty_lines.pl  | 20 +++++------
 tp/t/results/itemize/itemize_and_empty_lines.pl    | 36 +++++++++----------
 tp/t/results/itemize/itemize_long_item.pl          | 20 +++++------
 tp/t/results/itemize/table_in_itemize.pl           |  4 +--
 .../results/latex_tests/verbatim_in_smallformat.pl |  4 +--
 tp/t/results/macro/complex_argument.pl             |  8 ++---
 tp/t/results/macro/macro_expansion.pl              | 24 ++++++-------
 tp/t/results/macro/macro_in_misc_commands.pl       | 20 +++++------
 .../macro/space_macro_after_end_verbatim.pl        |  4 +--
 .../menu/block_commands_in_menu_description.pl     |  4 +--
 tp/t/results/menu/formats_in_menu.pl               |  4 +--
 tp/t/results/misc_commands/also_not_line.pl        | 20 +++++------
 tp/t/results/misc_commands/indent_in_quotation.pl  |  4 +--
 .../misc_commands/noindent_after_smallexample.pl   |  4 +--
 tp/t/results/misc_commands/noindent_empty_para.pl  |  4 +--
 .../results/misc_commands/noindent_in_paragraph.pl |  8 ++---
 tp/t/results/misc_commands/noindent_indent.pl      | 16 ++++-----
 tp/t/results/multitable/empty_item_tab.pl          | 40 +++++++++++-----------
 tp/t/results/multitable/ref_in_multitable.pl       |  4 +--
 tp/t/results/paragraph/commands_in_flushright.pl   |  4 +--
 .../at_commands_glued_in_example.pl                |  4 +--
 .../at_commands_glued_in_paragraph.pl              |  4 +--
 tp/t/results/plaintext_tests/east_asian_in_w.pl    |  4 +--
 .../plaintext_tests/long_uref_after_item.pl        |  4 +--
 tp/t/results/plaintext_tests/nested_multitable.pl  |  4 +--
 .../plaintext_tests/no_empty_line_after_section.pl |  4 +--
 tp/t/results/raw/misc_raw.pl                       |  4 +--
 tp/t/results/raw/misc_raw_comments.pl              |  4 +--
 tp/t/results/raw/raw_commands_and_end_of_lines.pl  | 24 ++++++-------
 tp/t/results/raw/raw_in_para.pl                    |  4 +--
 tp/t/results/raw/verbatim_and_verbatiminclude.pl   | 28 +++++++--------
 tp/t/results/raw/verbatim_in_brace_command.pl      |  4 +--
 tp/t/results/raw/verbatim_not_closed.pl            |  4 +--
 tp/t/results/value/value_in_misc_commands.pl       | 12 +++----
 tp/t/results/xml_tests/commands_and_spaces.pl      | 16 ++++-----
 .../xml_tests/comments_on_misc_command_line.pl     |  4 +--
 tp/t/results/xml_tests/spaces_info_lost.pl         |  4 +--
 62 files changed, 273 insertions(+), 264 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb3622f110..7c71ad09e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-09-04  Patrice Dumas  <pertusus@free.fr>
+
+       Rename spaces type extra command as spaces_associated_command
+
+       * tp/Texinfo/ParserNonXS.pm, tp/Texinfo/XS/parsetexi/parser.c:
+       use 'spaces_associated_command' as 'extra' key for spaces
+       of 'empty_spaces_before_argument' and 'empty_line_after_command'
+       types.
+
 2022-09-04  Patrice Dumas  <pertusus@free.fr>
 
        Abort empty line for empty @def* command line
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index f62126622d..9088df2619 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2326,8 +2326,8 @@ sub _abort_empty_line {
 
     my $owning_element;
     if ($spaces_element->{'extra'}
-        and $spaces_element->{'extra'}->{'command'}) {
-      $owning_element = $spaces_element->{'extra'}->{'command'};
+        and $spaces_element->{'extra'}->{'spaces_associated_command'}) {
+      $owning_element = 
$spaces_element->{'extra'}->{'spaces_associated_command'};
     }
 
     print STDERR "ABORT EMPTY "
@@ -3674,7 +3674,7 @@ sub _start_empty_line_after_command($$$) {
                                     'parent' => $current,
                                   };
   if (defined($command)) {
-    $current->{'contents'}->[-1]->{'extra'} = {'command' => $command};
+    $current->{'contents'}->[-1]->{'extra'} = {'spaces_associated_command' => 
$command};
   }
   return $line;
 }
@@ -5336,11 +5336,11 @@ sub _parse_texi($$$)
               # empty_spaces_before_argument is a transient internal type,
               # which should end up in extra spaces_before_argument.
               push @{$current->{'contents'}}, {
-                            'type' => 'empty_spaces_before_argument',
-                            'text' => $1,
-                            'parent' => $current,
-                            'extra' => {'command' => $current->{'parent'}}
-                          };
+                'type' => 'empty_spaces_before_argument',
+                'text' => $1,
+                'parent' => $current,
+                'extra' => {'spaces_associated_command' => 
$current->{'parent'}}
+              };
             } else {
               $current->{'type'} = 'brace_command_arg';
               # only put spaces in spaces_before_argument if the @-command
@@ -5354,7 +5354,7 @@ sub _parse_texi($$$)
                             'type' => 'empty_spaces_before_argument',
                             'text' => '',
                             'parent' => $current,
-                            'extra' => {'command' => $current}
+                            'extra' => {'spaces_associated_command' => 
$current}
                           };
               }
               $self->_push_context('ct_inlineraw', $command)
@@ -5383,7 +5383,7 @@ sub _parse_texi($$$)
                 {'type' => 'empty_spaces_before_argument',
                  'text' => '',
                  'parent' => $current,
-                 'extra' => {'command' => $current}
+                 'extra' => {'spaces_associated_command' => $current}
                };
             print STDERR "BRACKETED in def/multitable\n" if ($self->{'DEBUG'});
           # lone braces accepted right in a rawpreformatted
@@ -5779,7 +5779,7 @@ sub _parse_texi($$$)
                  {'type' => 'empty_spaces_before_argument',
                   'text' => '',
                   'parent' => $current,
-                  'extra' => {'command' => $current}
+                  'extra' => {'spaces_associated_command' => $current}
                 };
         } elsif ($separator eq ',' and $current->{'type'}
             and $current->{'type'} eq 'line_arg'
@@ -7438,7 +7438,7 @@ The corresponding Perl encoding name is in 
I<input_perl_encoding>.
 
 =item empty_line_after_command
 
-The corresponding command is in I<command>.
+The corresponding command is in I<spaces_associated_command>.
 
 =item C<@end>
 
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 236d3a5d79..89d60bceb4 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -622,7 +622,7 @@ abort_empty_line (ELEMENT **current_inout, char 
*additional_spaces)
 
       retval = 1;
 
-      k = lookup_extra (last_child, "command");
+      k = lookup_extra (last_child, "spaces_associated_command");
       if (k)
         owning_element = (ELEMENT *) k->value;
 
@@ -809,7 +809,7 @@ start_empty_line_after_command (ELEMENT *current, char 
**line_inout,
   line += len;
 
   if (command)
-    add_extra_element (e, "command", command);
+    add_extra_element (e, "spaces_associated_command", command);
 
   *line_inout = line;
 }
diff --git a/tp/Texinfo/XS/parsetexi/separator.c 
b/tp/Texinfo/XS/parsetexi/separator.c
index 35a4e5f3cd..e367d0168f 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -127,7 +127,7 @@ handle_open_brace (ELEMENT *current, char **line_inout)
             e = new_element (ET_empty_spaces_before_argument);
             text_append_n (&e->text, line, n);
             add_to_element_contents (current, e);
-            add_extra_element (e, "command", current->parent);
+            add_extra_element (e, "spaces_associated_command", 
current->parent);
             line += n;
           }
           current->type = ET_brace_command_context;
@@ -145,7 +145,7 @@ handle_open_brace (ELEMENT *current, char **line_inout)
               /* See comment in parser.c:merge_text */
               text_append (&e->text, "");
               add_to_element_contents (current, e);
-              add_extra_element (e, "command", current);
+              add_extra_element (e, "spaces_associated_command", current);
 
               if (command == CM_inlineraw)
                 push_context (ct_inlineraw, command);
@@ -170,7 +170,7 @@ handle_open_brace (ELEMENT *current, char **line_inout)
       text_append (&e->text, ""); /* See comment in parser.c:merge_text */
       add_to_element_contents (current, e);
       debug ("BRACKETED in def/multitable");
-      add_extra_element (e, "command", current);
+      add_extra_element (e, "spaces_associated_command", current);
     }
   else if (current->type == ET_rawpreformatted)
     {
@@ -719,7 +719,7 @@ inlinefmtifelse_done:
   e = new_element (ET_empty_spaces_before_argument);
   text_append (&e->text, ""); /* See comment in parser.c:merge_text */
   add_to_element_contents (current, e);
-  add_extra_element (e, "command", current);
+  add_extra_element (e, "spaces_associated_command", current);
   
 funexit:
   *line_inout = line;
diff --git a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl 
b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
index 1fdaa5df98..91191d97c1 100644
--- a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
+++ b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
@@ -50,7 +50,7 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -89,7 +89,7 @@ 
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[1]{'args'}[
 
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0];
 
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0];
-$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'empty_ifset_in_ifset_set'}{'contents'}[0];
diff --git a/tp/t/results/conditionals/end_ifset_in_format.pl 
b/tp/t/results/conditionals/end_ifset_in_format.pl
index cfa0a6ff15..4dba5a857d 100644
--- a/tp/t/results/conditionals/end_ifset_in_format.pl
+++ b/tp/t/results/conditionals/end_ifset_in_format.pl
@@ -50,7 +50,7 @@ $result_trees{'end_ifset_in_format'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -104,7 +104,7 @@ $result_trees{'end_ifset_in_format'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -193,7 +193,7 @@ 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'p
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[1];
 $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[0];
 $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[0];
-$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3];
+$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[3];
@@ -202,7 +202,7 @@ 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[4]{'parent'} = $
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[5];
 $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[0];
 $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[0];
-$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[7];
+$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[7];
 $result_trees{'end_ifset_in_format'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'end_ifset_in_format'}{'contents'}[0];
diff --git a/tp/t/results/conditionals/ignore_not_closed.pl 
b/tp/t/results/conditionals/ignore_not_closed.pl
index c87b7c3504..63b33945aa 100644
--- a/tp/t/results/conditionals/ignore_not_closed.pl
+++ b/tp/t/results/conditionals/ignore_not_closed.pl
@@ -14,7 +14,7 @@ $result_trees{'ignore_not_closed'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -48,7 +48,7 @@ $result_trees{'ignore_not_closed'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ignore_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'ignore_not_closed'}{'contents'}[0]{'contents'}[0];
+$result_trees{'ignore_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'ignore_not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ignore_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ignore_not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ignore_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ignore_not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ignore_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'ignore_not_closed'}{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/conditionals/nested_ignore.pl 
b/tp/t/results/conditionals/nested_ignore.pl
index 5549af5ec0..558397cbd9 100644
--- a/tp/t/results/conditionals/nested_ignore.pl
+++ b/tp/t/results/conditionals/nested_ignore.pl
@@ -14,7 +14,7 @@ $result_trees{'nested_ignore'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -63,7 +63,7 @@ $result_trees{'nested_ignore'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -112,7 +112,7 @@ $result_trees{'nested_ignore'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => ' 
@@ -157,7 +157,7 @@ $result_trees{'nested_ignore'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0];
@@ -165,7 +165,7 @@ 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'par
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3];
+$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3];
@@ -173,7 +173,7 @@ 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'par
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
 $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'nested_ignore'}{'contents'}[0];
-$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[6];
+$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'nested_ignore'}{'contents'}[0]{'contents'}[6];
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 6882f67f24..c0c06cf58f 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -10808,7 +10808,7 @@ $result_trees{'definition_commands'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => ' ',
@@ -23087,7 +23087,7 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'extra'}{'en
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[18]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[19]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[20]{'extra'}{'command'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[19];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[20]{'extra'}{'spaces_associated_command'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[19];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[20]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[21];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[21]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
diff --git a/tp/t/results/coverage/item_container.pl 
b/tp/t/results/coverage/item_container.pl
index 2cd3e87522..fbf0c8d564 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -139,7 +139,7 @@ $result_trees{'item_container'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -332,7 +332,7 @@ 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[1]{'parent'} = $resul
 $result_trees{'item_container'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'item_container'}{'contents'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3];
-$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/coverage/symbol_after_block.pl 
b/tp/t/results/coverage/symbol_after_block.pl
index 11cd450208..7a690e62b7 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -183,7 +183,7 @@ $result_trees{'symbol_after_block'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -226,7 +226,7 @@ $result_trees{'symbol_after_block'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -1601,14 +1601,14 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[3]{'parent'} = $r
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[4];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[6];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[6];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[7];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[9];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[9];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index 7e42b8c9c3..1e05897462 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -4308,7 +4308,7 @@ $result_trees{'texi_bib_example'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -5008,7 +5008,7 @@ 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'cont
 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[0];
 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1];
-$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl 
b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
index 788d5a713b..ffa671d922 100644
--- a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
+++ b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
@@ -136,7 +136,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                           'contents' => [
                             {
                               'extra' => {
-                                'command' => {}
+                                'spaces_associated_command' => {}
                               },
                               'parent' => {},
                               'text' => '
@@ -148,7 +148,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                               'contents' => [
                                 {
                                   'extra' => {
-                                    'command' => {}
+                                    'spaces_associated_command' => {}
                                   },
                                   'parent' => {},
                                   'text' => '
@@ -191,7 +191,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                           'contents' => [
                             {
                               'extra' => {
-                                'command' => {}
+                                'spaces_associated_command' => {}
                               },
                               'parent' => {},
                               'text' => '
@@ -354,15 +354,15 @@ 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/html_tests/xml_protected_in_verb.pl 
b/tp/t/results/html_tests/xml_protected_in_verb.pl
index 739f9b6bd0..bb17b5155d 100644
--- a/tp/t/results/html_tests/xml_protected_in_verb.pl
+++ b/tp/t/results/html_tests/xml_protected_in_verb.pl
@@ -14,7 +14,7 @@ $result_trees{'xml_protected_in_verb'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -127,7 +127,7 @@ $result_trees{'xml_protected_in_verb'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0];
+$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0];
 $result_trees{'xml_protected_in_verb'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'xml_protected_in_verb'}{'contents'}[0];
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index ec127f6d34..22123b3e87 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -169,7 +169,7 @@ $result_trees{'cpp_lines'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -1166,7 +1166,7 @@ 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[1];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
 $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'cpp_lines'}{'contents'}[1];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[3];
diff --git a/tp/t/results/info_tests/nested_multitable_anchor_index.pl 
b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index 34e884a7ca..a889f0789d 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -85,7 +85,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -730,7 +730,7 @@ 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'a
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index bc4903a81b..f168a26464 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -24,7 +24,7 @@ $result_trees{'center'} = {
                 },
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => ' ',
@@ -1392,7 +1392,7 @@ $result_trees{'center'} = {
   'type' => 'document_root'
 };
 
$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'command'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl 
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 4f0908b9ce..4db8c26dd6 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -58,7 +58,7 @@ $result_trees{'ignore_in_xref'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -158,7 +158,7 @@ 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'args'}[0]{'parent'} = $result_tr
 $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'ignore_in_xref'}{'contents'}[1];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index e16efdd1c0..dedca8a995 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -164,7 +164,7 @@ $result_trees{'in_table'} = {
                             },
                             {
                               'extra' => {
-                                'command' => {}
+                                'spaces_associated_command' => {}
                               },
                               'parent' => {},
                               'text' => ' ',
@@ -1074,7 +1074,7 @@ 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_tree
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'command'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/invalid_nestings/on_block_command_line.pl 
b/tp/t/results/invalid_nestings/on_block_command_line.pl
index ee407c3f65..8022ed190f 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -213,7 +213,7 @@ $result_trees{'on_block_command_line'} = {
                 },
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => ' ',
@@ -414,7 +414,7 @@ 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'p
 $result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'on_block_command_line'}{'contents'}[0];
 $result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'on_block_command_line'}{'contents'}[0];
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'command'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/invalid_nestings/on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/on_index_entry_line.pl
index 17c601ca39..e4517256a5 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -24,7 +24,7 @@ $result_trees{'on_index_entry_line'} = {
                 },
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => ' ',
@@ -180,7 +180,7 @@ $result_trees{'on_index_entry_line'} = {
   'type' => 'document_root'
 };
 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'command'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl 
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index 6befbe4ff7..bbc2d8a6e4 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -24,7 +24,7 @@ $result_trees{'on_itemize_line'} = {
                 },
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => ' ',
@@ -303,7 +303,7 @@ $result_trees{'on_itemize_line'} = {
   'type' => 'document_root'
 };
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'command'}
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index 282c39b904..ceb9b31352 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -27,7 +27,7 @@ $result_trees{'on_section_line'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => ' ',
@@ -173,7 +173,7 @@ $result_trees{'on_section_line'} = {
 };
 $result_trees{'on_section_line'}{'contents'}[0]{'parent'} = 
$result_trees{'on_section_line'};
 
$result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0];
-$result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_associated_command'}
 = $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0];
 
$result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'on_section_line'}{'contents'}[1]{'args'}[0];
 
$result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
diff --git a/tp/t/results/invalid_nestings/on_subheading_line.pl 
b/tp/t/results/invalid_nestings/on_subheading_line.pl
index 78c49956e7..2a8d6bae24 100644
--- a/tp/t/results/invalid_nestings/on_subheading_line.pl
+++ b/tp/t/results/invalid_nestings/on_subheading_line.pl
@@ -24,7 +24,7 @@ $result_trees{'on_subheading_line'} = {
                 },
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => ' ',
@@ -172,7 +172,7 @@ $result_trees{'on_subheading_line'} = {
   'type' => 'document_root'
 };
 
$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'command'}
 = 
$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0];
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 00e0604d7f..47aefe46ae 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -79,7 +79,7 @@ $result_trees{'verbatim_in_ref'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -157,7 +157,7 @@ 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'a
 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1];
 $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'verbatim_in_ref'}{'contents'}[1];
-$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
+$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2];
 $result_trees{'verbatim_in_ref'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'verbatim_in_ref'}{'contents'}[1];
diff --git a/tp/t/results/itemize/enumerate_and_empty_lines.pl 
b/tp/t/results/itemize/enumerate_and_empty_lines.pl
index 2e63571582..1076474388 100644
--- a/tp/t/results/itemize/enumerate_and_empty_lines.pl
+++ b/tp/t/results/itemize/enumerate_and_empty_lines.pl
@@ -54,7 +54,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => ' 
@@ -154,7 +154,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => ' 
@@ -194,7 +194,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -289,7 +289,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => ' 
@@ -384,7 +384,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -615,7 +615,7 @@ 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'args'}
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -628,13 +628,13 @@ 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2];
@@ -646,7 +646,7 @@ 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
@@ -658,7 +658,7 @@ 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2];
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl 
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index 2896bb10ff..ca0d112a1f 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -59,7 +59,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -159,7 +159,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -199,7 +199,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -366,7 +366,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -556,7 +556,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -656,7 +656,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -696,7 +696,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -791,7 +791,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -886,7 +886,7 @@ $result_trees{'itemize_and_empty_lines'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -1556,7 +1556,7 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -1569,13 +1569,13 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2];
@@ -1596,7 +1596,7 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[4]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2];
@@ -1619,7 +1619,7 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -1632,13 +1632,13 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2];
@@ -1650,7 +1650,7 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
@@ -1662,7 +1662,7 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2];
diff --git a/tp/t/results/itemize/itemize_long_item.pl 
b/tp/t/results/itemize/itemize_long_item.pl
index 665d089dbb..76c70bbeaa 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -59,7 +59,7 @@ $result_trees{'itemize_long_item'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -159,7 +159,7 @@ $result_trees{'itemize_long_item'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -199,7 +199,7 @@ $result_trees{'itemize_long_item'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -294,7 +294,7 @@ $result_trees{'itemize_long_item'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -389,7 +389,7 @@ $result_trees{'itemize_long_item'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -533,7 +533,7 @@ 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'par
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -546,13 +546,13 @@ 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2];
@@ -564,7 +564,7 @@ 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
@@ -576,7 +576,7 @@ 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2];
diff --git a/tp/t/results/itemize/table_in_itemize.pl 
b/tp/t/results/itemize/table_in_itemize.pl
index a98a8af2bb..bbedabbcd9 100644
--- a/tp/t/results/itemize/table_in_itemize.pl
+++ b/tp/t/results/itemize/table_in_itemize.pl
@@ -66,7 +66,7 @@ $result_trees{'table_in_itemize'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -378,7 +378,7 @@ 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'pare
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0];
-$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/latex_tests/verbatim_in_smallformat.pl 
b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
index 7463918e5b..955d3ac041 100644
--- a/tp/t/results/latex_tests/verbatim_in_smallformat.pl
+++ b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
@@ -33,7 +33,7 @@ $result_trees{'verbatim_in_smallformat'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -110,7 +110,7 @@ $result_trees{'verbatim_in_smallformat'} = {
 };
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_smallformat'}{'contents'}[0];
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1];
-$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/macro/complex_argument.pl 
b/tp/t/results/macro/complex_argument.pl
index 06c6622b4f..cdb8b2ea68 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -329,7 +329,7 @@ $result_trees{'complex_argument'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -361,7 +361,7 @@ $result_trees{'complex_argument'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -586,12 +586,12 @@ 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[8]{'
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[9]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'contents'}[10]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9];
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10];
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
 $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'complex_argument'}{'contents'}[0];
-$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[12];
+$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[12];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[12];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[12];
 
$result_trees{'complex_argument'}{'contents'}[0]{'contents'}[12]{'contents'}[2]{'parent'}
 = $result_trees{'complex_argument'}{'contents'}[0]{'contents'}[12];
diff --git a/tp/t/results/macro/macro_expansion.pl 
b/tp/t/results/macro/macro_expansion.pl
index e05d617c31..9256e6dcce 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -104,7 +104,7 @@ $result_trees{'macro_expansion'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -184,7 +184,7 @@ $result_trees{'macro_expansion'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -238,7 +238,7 @@ $result_trees{'macro_expansion'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -297,7 +297,7 @@ $result_trees{'macro_expansion'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -351,7 +351,7 @@ $result_trees{'macro_expansion'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -422,7 +422,7 @@ $result_trees{'macro_expansion'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -486,7 +486,7 @@ 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[2]{'parent'} = $resu
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[4];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
-$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[5];
+$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[5];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
@@ -499,7 +499,7 @@ 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'a
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[8];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
-$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[9];
+$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[9];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
@@ -508,7 +508,7 @@ 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[10]{'parent'} = $res
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[12];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
-$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[13];
+$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[13];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[13];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[13];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[13]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
@@ -518,7 +518,7 @@ 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[15]{'parent'} = $res
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[16]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[17];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[17]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
-$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[18];
+$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[18];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[18];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[18];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[18]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
@@ -527,7 +527,7 @@ 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[19]{'parent'} = $res
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[20]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[21]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[21];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[21]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
-$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[22];
+$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[22];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[22];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[22];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[22]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
@@ -539,7 +539,7 @@ 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[25]{'parent'} = $res
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[26]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[27]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[27];
 $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[27]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[0];
-$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[28];
+$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[28];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[28];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[28];
 
$result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[28]{'contents'}[2]{'parent'}
 = $result_trees{'macro_expansion'}{'contents'}[0]{'contents'}[28];
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 83d9898506..74bb801104 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -2621,7 +2621,7 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => ' ',
@@ -2665,7 +2665,7 @@ $result_trees{'macro_in_misc_commands'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '     ',
@@ -2689,7 +2689,7 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -2716,7 +2716,7 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '    ',
@@ -2826,7 +2826,7 @@ $result_trees{'macro_in_misc_commands'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '    ',
@@ -3847,7 +3847,7 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[121]{'parent'
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'contents'}[3]{'extra'}{'command'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'contents'}[2];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'contents'}[3]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122];
@@ -3856,16 +3856,16 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'content
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[122]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[123]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[124]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[125]{'extra'}{'command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[124];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[125]{'extra'}{'spaces_associated_command'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[124];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[125]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[1];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[2]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[6]{'extra'}{'command'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[5];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[6]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[5];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'contents'}[7]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[126]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
@@ -3885,7 +3885,7 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'content
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'contents'}[4]{'extra'}{'command'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'contents'}[3];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'contents'}[4]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'contents'}[3];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[133];
diff --git a/tp/t/results/macro/space_macro_after_end_verbatim.pl 
b/tp/t/results/macro/space_macro_after_end_verbatim.pl
index 4e077d6bfa..1ae29ee507 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -59,7 +59,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -98,7 +98,7 @@ 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
-$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[3];
+$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'space_macro_after_end_verbatim'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'space_macro_after_end_verbatim'}{'contents'}[0];
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl 
b/tp/t/results/menu/block_commands_in_menu_description.pl
index ddd2fc0f5c..ca9d5be1f9 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -493,7 +493,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -662,7 +662,7 @@ 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index 1c78967132..fe7e57aa81 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -307,7 +307,7 @@ $result_trees{'formats_in_menu'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -811,7 +811,7 @@ 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'a
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1];
diff --git a/tp/t/results/misc_commands/also_not_line.pl 
b/tp/t/results/misc_commands/also_not_line.pl
index d8e463bb92..06986137c0 100644
--- a/tp/t/results/misc_commands/also_not_line.pl
+++ b/tp/t/results/misc_commands/also_not_line.pl
@@ -60,7 +60,7 @@ $result_trees{'also_not_line'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => ' ',
@@ -100,7 +100,7 @@ $result_trees{'also_not_line'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '     ',
@@ -124,7 +124,7 @@ $result_trees{'also_not_line'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '  
@@ -151,7 +151,7 @@ $result_trees{'also_not_line'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '    ',
@@ -249,7 +249,7 @@ $result_trees{'also_not_line'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '    ',
@@ -425,7 +425,7 @@ 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'
 $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'also_not_line'}{'contents'}[0];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4];
-$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
+$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'extra'}{'spaces_associated_command'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4];
@@ -433,16 +433,16 @@ 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'contents'}[5]{'par
 $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'also_not_line'}{'contents'}[0];
 $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'also_not_line'}{'contents'}[0];
 $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'also_not_line'}{'contents'}[0];
-$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[7]{'extra'}{'command'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[6];
+$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_associated_command'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[6];
 $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'also_not_line'}{'contents'}[0];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8];
-$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
+$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_associated_command'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8];
-$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[6]{'extra'}{'command'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[5];
+$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[6]{'extra'}{'spaces_associated_command'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[5];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[6]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'contents'}[7]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8];
 $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'also_not_line'}{'contents'}[0];
@@ -459,7 +459,7 @@ 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'parent
 $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[14]{'parent'} = 
$result_trees{'also_not_line'}{'contents'}[0];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15]{'contents'}[0]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15];
-$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
+$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15]{'contents'}[2]{'extra'}{'spaces_associated_command'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15]{'contents'}[2]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15]{'contents'}[3]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15]{'contents'}[4]{'parent'}
 = $result_trees{'also_not_line'}{'contents'}[0]{'contents'}[15];
diff --git a/tp/t/results/misc_commands/indent_in_quotation.pl 
b/tp/t/results/misc_commands/indent_in_quotation.pl
index 421a376ed8..a5760068a3 100644
--- a/tp/t/results/misc_commands/indent_in_quotation.pl
+++ b/tp/t/results/misc_commands/indent_in_quotation.pl
@@ -34,7 +34,7 @@ $result_trees{'indent_in_quotation'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -105,7 +105,7 @@ $result_trees{'indent_in_quotation'} = {
 };
 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0];
-$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
 = 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/misc_commands/noindent_after_smallexample.pl 
b/tp/t/results/misc_commands/noindent_after_smallexample.pl
index 809272f8bf..8da68a03a6 100644
--- a/tp/t/results/misc_commands/noindent_after_smallexample.pl
+++ b/tp/t/results/misc_commands/noindent_after_smallexample.pl
@@ -102,7 +102,7 @@ $result_trees{'noindent_after_smallexample'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '
@@ -142,7 +142,7 @@ 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'cont
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0];
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0];
-$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[2];
+$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_associated_command'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0];
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0];
diff --git a/tp/t/results/misc_commands/noindent_empty_para.pl 
b/tp/t/results/misc_commands/noindent_empty_para.pl
index 821526a457..d94bbdf5ed 100644
--- a/tp/t/results/misc_commands/noindent_empty_para.pl
+++ b/tp/t/results/misc_commands/noindent_empty_para.pl
@@ -20,7 +20,7 @@ $result_trees{'noindent_empty_para'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '
@@ -60,7 +60,7 @@ $result_trees{'noindent_empty_para'} = {
   'type' => 'document_root'
 };
 $result_trees{'noindent_empty_para'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'noindent_empty_para'}{'contents'}[0];
-$result_trees{'noindent_empty_para'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'noindent_empty_para'}{'contents'}[0]{'contents'}[0];
+$result_trees{'noindent_empty_para'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_associated_command'}
 = $result_trees{'noindent_empty_para'}{'contents'}[0]{'contents'}[0];
 $result_trees{'noindent_empty_para'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'noindent_empty_para'}{'contents'}[0];
 $result_trees{'noindent_empty_para'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'noindent_empty_para'}{'contents'}[0];
 $result_trees{'noindent_empty_para'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'noindent_empty_para'}{'contents'}[0];
diff --git a/tp/t/results/misc_commands/noindent_in_paragraph.pl 
b/tp/t/results/misc_commands/noindent_in_paragraph.pl
index a7ef569888..e36949e34e 100644
--- a/tp/t/results/misc_commands/noindent_in_paragraph.pl
+++ b/tp/t/results/misc_commands/noindent_in_paragraph.pl
@@ -27,7 +27,7 @@ $result_trees{'noindent_in_paragraph'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -67,7 +67,7 @@ $result_trees{'noindent_in_paragraph'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -92,14 +92,14 @@ $result_trees{'noindent_in_paragraph'} = {
 };
 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0];
-$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0];
 $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'noindent_in_paragraph'}{'contents'}[0];
 $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'noindent_in_paragraph'}{'contents'}[0];
 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2];
-$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2];
 $result_trees{'noindent_in_paragraph'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'noindent_in_paragraph'}{'contents'}[0];
diff --git a/tp/t/results/misc_commands/noindent_indent.pl 
b/tp/t/results/misc_commands/noindent_indent.pl
index fb108ff5f8..ad0cc26046 100644
--- a/tp/t/results/misc_commands/noindent_indent.pl
+++ b/tp/t/results/misc_commands/noindent_indent.pl
@@ -26,7 +26,7 @@ $result_trees{'noindent_indent'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '
@@ -64,7 +64,7 @@ $result_trees{'noindent_indent'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '
@@ -107,7 +107,7 @@ $result_trees{'noindent_indent'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => ' ',
@@ -144,7 +144,7 @@ $result_trees{'noindent_indent'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => ' ',
@@ -173,26 +173,26 @@ $result_trees{'noindent_indent'} = {
 };
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
-$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[1];
+$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_associated_command'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[1];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 
$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[3];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
-$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[6]{'extra'}{'command'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[5];
+$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[6]{'extra'}{'spaces_associated_command'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[5];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 
$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[7];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
-$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[10]{'extra'}{'command'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[9];
+$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[10]{'extra'}{'spaces_associated_command'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[9];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 
$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[11];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[13]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
-$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[14]{'extra'}{'command'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[13];
+$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[14]{'extra'}{'spaces_associated_command'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[13];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[14]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
 
$result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[15]{'contents'}[0]{'parent'}
 = $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[15];
 $result_trees{'noindent_indent'}{'contents'}[0]{'contents'}[15]{'parent'} = 
$result_trees{'noindent_indent'}{'contents'}[0];
diff --git a/tp/t/results/multitable/empty_item_tab.pl 
b/tp/t/results/multitable/empty_item_tab.pl
index 968e14fa8c..0b9e080997 100644
--- a/tp/t/results/multitable/empty_item_tab.pl
+++ b/tp/t/results/multitable/empty_item_tab.pl
@@ -60,7 +60,7 @@ $result_trees{'empty_item_tab'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -98,7 +98,7 @@ $result_trees{'empty_item_tab'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -165,7 +165,7 @@ $result_trees{'empty_item_tab'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -296,7 +296,7 @@ $result_trees{'empty_item_tab'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -334,7 +334,7 @@ $result_trees{'empty_item_tab'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -432,7 +432,7 @@ $result_trees{'empty_item_tab'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -490,7 +490,7 @@ $result_trees{'empty_item_tab'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -542,7 +542,7 @@ $result_trees{'empty_item_tab'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -574,7 +574,7 @@ $result_trees{'empty_item_tab'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -597,7 +597,7 @@ $result_trees{'empty_item_tab'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -747,12 +747,12 @@ 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'conten
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -760,7 +760,7 @@ 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -776,12 +776,12 @@ 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'conten
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
@@ -793,27 +793,27 @@ 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'co
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[6];
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index 1522b042cd..a690086ff8 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -416,7 +416,7 @@ $result_trees{'ref_in_multitable'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => ' 
@@ -613,7 +613,7 @@ 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1];
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index b53403f6c9..aaa49b99a1 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -631,7 +631,7 @@ $result_trees{'commands_in_flushright'} = {
                           'contents' => [
                             {
                               'extra' => {
-                                'command' => {}
+                                'spaces_associated_command' => {}
                               },
                               'parent' => {},
                               'text' => ' 
@@ -1296,7 +1296,7 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
index 5b9cba54fa..626b8ba43d 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
@@ -367,7 +367,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                 },
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => ' ',
@@ -602,7 +602,7 @@ 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'con
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[29]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[30]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[31]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[32]{'extra'}{'command'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[31];
+$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[32]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[31];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[32]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[33]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[34]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
index 06f15fb455..bfba822530 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
@@ -353,7 +353,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => ' ',
@@ -552,7 +552,7 @@ 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[29]{'parent'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[30]{'parent'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[31]{'parent'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[32]{'extra'}{'command'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[31];
+$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[32]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[31];
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[32]{'parent'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[33]{'parent'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[34]{'parent'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/plaintext_tests/east_asian_in_w.pl 
b/tp/t/results/plaintext_tests/east_asian_in_w.pl
index 29585d31b1..40de115da8 100644
--- a/tp/t/results/plaintext_tests/east_asian_in_w.pl
+++ b/tp/t/results/plaintext_tests/east_asian_in_w.pl
@@ -111,7 +111,7 @@ $result_trees{'east_asian_in_w'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '
@@ -164,7 +164,7 @@ 
$result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'p
 $result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'east_asian_in_w'}{'contents'}[0];
 $result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'east_asian_in_w'}{'contents'}[0];
 $result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'east_asian_in_w'}{'contents'}[0];
-$result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[3];
+$result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[4]{'extra'}{'spaces_associated_command'}
 = $result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[3];
 $result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'east_asian_in_w'}{'contents'}[0];
 
$result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'east_asian_in_w'}{'contents'}[0]{'contents'}[5];
diff --git a/tp/t/results/plaintext_tests/long_uref_after_item.pl 
b/tp/t/results/plaintext_tests/long_uref_after_item.pl
index 345ec6daa6..0ace2caa6e 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -35,7 +35,7 @@ $result_trees{'long_uref_after_item'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -137,7 +137,7 @@ $result_trees{'long_uref_after_item'} = {
 };
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0];
-$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
diff --git a/tp/t/results/plaintext_tests/nested_multitable.pl 
b/tp/t/results/plaintext_tests/nested_multitable.pl
index da490d7eff..99c38154f1 100644
--- a/tp/t/results/plaintext_tests/nested_multitable.pl
+++ b/tp/t/results/plaintext_tests/nested_multitable.pl
@@ -71,7 +71,7 @@ $result_trees{'nested_multitable'} = {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
+                            'spaces_associated_command' => {}
                           },
                           'parent' => {},
                           'text' => '
@@ -428,7 +428,7 @@ 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'con
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
diff --git a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl 
b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
index 890902783a..3ed69a268b 100644
--- a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
+++ b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
@@ -284,7 +284,7 @@ $result_trees{'no_empty_line_after_section'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '
@@ -359,7 +359,7 @@ 
$result_trees{'no_empty_line_after_section'}{'contents'}[3]{'parent'} = $result_
 
$result_trees{'no_empty_line_after_section'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'no_empty_line_after_section'}{'contents'}[4]{'args'}[0];
 
$result_trees{'no_empty_line_after_section'}{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'no_empty_line_after_section'}{'contents'}[4];
 
$result_trees{'no_empty_line_after_section'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'no_empty_line_after_section'}{'contents'}[4];
-$result_trees{'no_empty_line_after_section'}{'contents'}[4]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'no_empty_line_after_section'}{'contents'}[4]{'contents'}[0];
+$result_trees{'no_empty_line_after_section'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_associated_command'}
 = $result_trees{'no_empty_line_after_section'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'no_empty_line_after_section'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'no_empty_line_after_section'}{'contents'}[4];
 
$result_trees{'no_empty_line_after_section'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'no_empty_line_after_section'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'no_empty_line_after_section'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'no_empty_line_after_section'}{'contents'}[4];
diff --git a/tp/t/results/raw/misc_raw.pl b/tp/t/results/raw/misc_raw.pl
index 4011c1999a..1689b912cc 100644
--- a/tp/t/results/raw/misc_raw.pl
+++ b/tp/t/results/raw/misc_raw.pl
@@ -158,7 +158,7 @@ $result_trees{'misc_raw'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -216,7 +216,7 @@ 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'} 
= $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'misc_raw'}{'contents'}[0];
 $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'misc_raw'}{'contents'}[0];
-$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5];
+$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5];
diff --git a/tp/t/results/raw/misc_raw_comments.pl 
b/tp/t/results/raw/misc_raw_comments.pl
index ac79c5034e..3bd60e80ba 100644
--- a/tp/t/results/raw/misc_raw_comments.pl
+++ b/tp/t/results/raw/misc_raw_comments.pl
@@ -208,7 +208,7 @@ $result_trees{'misc_raw_comments'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -272,7 +272,7 @@ 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[0];
-$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5];
+$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5];
diff --git a/tp/t/results/raw/raw_commands_and_end_of_lines.pl 
b/tp/t/results/raw/raw_commands_and_end_of_lines.pl
index 37e1205d97..9c9dd8c5ac 100644
--- a/tp/t/results/raw/raw_commands_and_end_of_lines.pl
+++ b/tp/t/results/raw/raw_commands_and_end_of_lines.pl
@@ -1021,7 +1021,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -1070,7 +1070,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -1129,7 +1129,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -1188,7 +1188,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -1246,7 +1246,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -1305,7 +1305,7 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -1480,7 +1480,7 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'c
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[24]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[25]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[25];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[25]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[25];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[25]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[25];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[25]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[25];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[25]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1488,7 +1488,7 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[26]{'p
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[27]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[28];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[28]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[29]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[29];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[29]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[29];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[29]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[29];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[29]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[29];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[29]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1498,7 +1498,7 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[31]{'p
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[32]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[33]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[33];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[33]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[34];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[34];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[34];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[34];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[34]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1508,7 +1508,7 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[36]{'p
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[37]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[38];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[38]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[39]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[39];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[39]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[39];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[39]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[39];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[39]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[39];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[39]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1518,7 +1518,7 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[41]{'p
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[42]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[43]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[43];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[43]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[44];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[44];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[44];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[44];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[44]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1528,7 +1528,7 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[46]{'p
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[47]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[48];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[48]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[49]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[49];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[49]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[49];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[49]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[49];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[49]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[49];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[49]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
diff --git a/tp/t/results/raw/raw_in_para.pl b/tp/t/results/raw/raw_in_para.pl
index a1df167ccc..7d5ff601ac 100644
--- a/tp/t/results/raw/raw_in_para.pl
+++ b/tp/t/results/raw/raw_in_para.pl
@@ -25,7 +25,7 @@ $result_trees{'raw_in_para'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -260,7 +260,7 @@ $result_trees{'raw_in_para'} = {
 };
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[0];
 $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[0];
-$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[1];
 $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[0];
diff --git a/tp/t/results/raw/verbatim_and_verbatiminclude.pl 
b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
index a8b1b48ea5..f8993b7cca 100644
--- a/tp/t/results/raw/verbatim_and_verbatiminclude.pl
+++ b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
@@ -14,7 +14,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -63,7 +63,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -137,7 +137,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -233,7 +233,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -509,7 +509,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -637,7 +637,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -759,7 +759,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               'contents' => [
                 {
                   'extra' => {
-                    'command' => {}
+                    'spaces_associated_command' => {}
                   },
                   'parent' => {},
                   'text' => '
@@ -845,7 +845,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
@@ -853,7 +853,7 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[1]{'par
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[4];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
@@ -864,7 +864,7 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[7]{'par
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
@@ -878,7 +878,7 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'par
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[11];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[11];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[11];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[11];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
@@ -914,7 +914,7 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'ar
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
@@ -932,7 +932,7 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'ar
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[2];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[2];
@@ -949,7 +949,7 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'ar
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[2];
+$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[2]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27];
diff --git a/tp/t/results/raw/verbatim_in_brace_command.pl 
b/tp/t/results/raw/verbatim_in_brace_command.pl
index 30e599fbde..717d3b1140 100644
--- a/tp/t/results/raw/verbatim_in_brace_command.pl
+++ b/tp/t/results/raw/verbatim_in_brace_command.pl
@@ -43,7 +43,7 @@ $result_trees{'verbatim_in_brace_command'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -86,7 +86,7 @@ 
$result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_brace_command'}{'contents'}[0];
-$result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[1];
+$result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_brace_command'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_in_brace_command'}{'contents'}[0];
diff --git a/tp/t/results/raw/verbatim_not_closed.pl 
b/tp/t/results/raw/verbatim_not_closed.pl
index 8bbc3251db..07d031ec9e 100644
--- a/tp/t/results/raw/verbatim_not_closed.pl
+++ b/tp/t/results/raw/verbatim_not_closed.pl
@@ -14,7 +14,7 @@ $result_trees{'verbatim_not_closed'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -66,7 +66,7 @@ $result_trees{'verbatim_not_closed'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'verbatim_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'verbatim_not_closed'}{'contents'}[0]{'contents'}[0];
+$result_trees{'verbatim_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'verbatim_not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'verbatim_not_closed'}{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 0cf700a5bb..2d6bb6352e 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -2264,7 +2264,7 @@ $result_trees{'value_in_misc_commands'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '     ',
@@ -2288,7 +2288,7 @@ $result_trees{'value_in_misc_commands'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '
@@ -2315,7 +2315,7 @@ $result_trees{'value_in_misc_commands'} = {
             },
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '    ',
@@ -3058,16 +3058,16 @@ 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[100]{'args'}[
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[100]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[101]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[102]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2];
-$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'extra'}{'command'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[102];
+$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'extra'}{'spaces_associated_command'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[102];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[103]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[0]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[1]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104];
-$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[1];
+$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[2]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[1];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[2]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[3]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[4]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[5]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104];
-$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[6]{'extra'}{'command'}
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[5];
+$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[6]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[5];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[6]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'contents'}[7]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[104]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2];
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 409f992feb..c513265605 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -262,7 +262,7 @@ $result_trees{'commands_and_spaces'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '  ',
@@ -299,7 +299,7 @@ $result_trees{'commands_and_spaces'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '
@@ -337,7 +337,7 @@ $result_trees{'commands_and_spaces'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => '  
@@ -1091,7 +1091,7 @@ $result_trees{'commands_and_spaces'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '  
@@ -1870,19 +1870,19 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'p
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'commands_and_spaces'}{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_associated_command'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[3];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[5];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'parent'} = 
$result_trees{'commands_and_spaces'}{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[8]{'extra'}{'command'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[8]{'extra'}{'spaces_associated_command'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[8]{'parent'} = 
$result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'parent'} = 
$result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[10]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[11]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[12]{'extra'}{'command'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[11];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[12]{'extra'}{'spaces_associated_command'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[11];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[12]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[13];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[13]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
@@ -1986,7 +1986,7 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'pr
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[4]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[4];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[28]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[1]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
diff --git a/tp/t/results/xml_tests/comments_on_misc_command_line.pl 
b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
index 8a5acef8ae..70e7e0419c 100644
--- a/tp/t/results/xml_tests/comments_on_misc_command_line.pl
+++ b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
@@ -301,7 +301,7 @@ $result_trees{'comments_on_misc_command_line'} = {
         },
         {
           'extra' => {
-            'command' => {}
+            'spaces_associated_command' => {}
           },
           'parent' => {},
           'text' => ' ',
@@ -380,7 +380,7 @@ 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[6]{'ar
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0];
-$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[9]{'extra'}{'command'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[8];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[9]{'extra'}{'spaces_associated_command'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'contents'}[10];
diff --git a/tp/t/results/xml_tests/spaces_info_lost.pl 
b/tp/t/results/xml_tests/spaces_info_lost.pl
index 63715e75d7..2492a4e4ae 100644
--- a/tp/t/results/xml_tests/spaces_info_lost.pl
+++ b/tp/t/results/xml_tests/spaces_info_lost.pl
@@ -92,7 +92,7 @@ $result_trees{'spaces_info_lost'} = {
           'contents' => [
             {
               'extra' => {
-                'command' => {}
+                'spaces_associated_command' => {}
               },
               'parent' => {},
               'text' => '  
@@ -137,7 +137,7 @@ 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'
 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'spaces_info_lost'}{'contents'}[0];
 $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'spaces_info_lost'}{'contents'}[0];
-$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2];
+$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2];
 $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'spaces_info_lost'}{'contents'}[0];



reply via email to

[Prev in Thread] Current Thread [Next in Thread]