branch master updated: * tp/Texinfo/ParserNonXS.pm (_end_line), tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block): insert 'command_as_argument_inserted' in the proper 'block_line_arg' type when default @bullet formatting command is added on an @itemize line.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 1df7d57240 * tp/Texinfo/ParserNonXS.pm (_end_line), 
tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block): insert 
'command_as_argument_inserted' in the proper 'block_line_arg' type when default 
@bullet formatting command is added on an @itemize line.
1df7d57240 is described below

commit 1df7d5724078533a9cd5e298a3cfa39d579a28e5
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Aug 31 22:33:30 2022 +0200

    * tp/Texinfo/ParserNonXS.pm (_end_line),
    tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block):
    insert 'command_as_argument_inserted' in the proper
    'block_line_arg' type when default @bullet formatting command
    is added on an @itemize line.
---
 ChangeLog                                          |  8 ++
 tp/Texinfo/ParserNonXS.pm                          | 23 ++++--
 tp/Texinfo/XS/parsetexi/end_line.c                 | 13 +++-
 .../coverage/formats_only_title_comments.pl        | 15 +++-
 tp/t/results/coverage/formats_only_titles.pl       | 15 +++-
 tp/t/results/coverage/formats_titles.pl            | 15 +++-
 tp/t/results/coverage/item_container.pl            | 15 +++-
 tp/t/results/html_tests/simple_menu.pl             | 90 ++++++++++++++++------
 .../itemx_in_itemize_enumerate_in_table.pl         | 15 +++-
 .../itemize/comment_first_on_itemize_line.pl       | 23 +++---
 tp/t/results/itemize/headitem_itemx_in_itemize.pl  | 15 +++-
 .../itemize/inter_item_commands_in_itemize.pl      | 15 +++-
 tp/t/results/itemize/itemize_and_empty_lines.pl    | 15 +++-
 tp/t/results/itemize/not_closed_item.pl            | 15 +++-
 tp/t/results/itemize/not_closed_itemize.pl         | 15 +++-
 tp/t/results/latex_tests/nested_itemize.pl         | 60 +++++++++++----
 .../menu/block_commands_in_menu_description.pl     | 15 +++-
 .../itemize_in_headitem_in_example.pl              | 60 +++++++++++----
 .../plaintext_tests/long_uref_after_item.pl        | 15 +++-
 tp/t/results/xml_tests/comments_end_lines.pl       | 15 +++-
 .../xml_tests/comments_on_block_command_lines.pl   | 26 ++++---
 21 files changed, 361 insertions(+), 137 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e5f9f10d31..91e23d1df4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-08-31  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_end_line),
+       tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block):
+       insert 'command_as_argument_inserted' in the proper
+       'block_line_arg' type when default @bullet formatting command
+       is added on an @itemize line.
+
 2022-08-30  Patrice Dumas  <pertusus@free.fr>
 
        * doc/texinfo.texi (@code{@@caption @@shortcaption}): no multiple
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 1acead1102..aee1031f30 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2355,6 +2355,8 @@ sub _isolate_last_space
             or ($current->{'contents'}->[-1]->{'type'}
                   and (!$current->{'type'}
                         or $current->{'type'} ne 'line_arg'))
+                        #or ($current->{'type'} ne 'line_arg'
+                        #    and $current->{'type'} ne 'block_line_arg')))
             or $current->{'contents'}->[-1]->{'text'} !~ /\s+$/;
 
   if ($current->{'type'} and $current->{'type'} eq 'menu_entry_node') {
@@ -3157,11 +3159,22 @@ sub _end_line($$$)
             or !$current->{'args'}->[0]
             or !$current->{'args'}->[0]->{'contents'}
             or !@{$current->{'args'}->[0]->{'contents'}})) {
-          my $inserted =  { 'cmdname' => 'bullet',
-                            'contents' => [],
-                            'type' => 'command_as_argument_inserted',
-                            'parent' => $current };
-          unshift @{$current->{'args'}}, $inserted;
+          my $block_line_arg;
+          if ($current->{'args'} and $current->{'args'}->[-1]
+              and $current->{'args'}->[-1]->{'type'}
+              and $current->{'args'}->[-1]->{'type'} eq 'block_line_arg') {
+            $block_line_arg = $current->{'args'}->[-1];
+          } else {
+            $block_line_arg = { 'type' => 'block_line_arg',
+                                'parent' => $current,
+                                'contents' => [] };
+            unshift @{$current->{'args'}}, $block_line_arg;
+          }
+          my $inserted = { 'cmdname' => 'bullet',
+                           'contents' => [],
+                           'type' => 'command_as_argument_inserted',
+                           'parent' => $block_line_arg };
+          unshift @{$block_line_arg->{'contents'}}, $inserted;
           $current->{'extra'}->{'command_as_argument'} = $inserted;
         }
       } elsif ($item_line_commands{$current->{'cmdname'}} and
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index 4f5486c441..c6c09bbdc5 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1243,10 +1243,21 @@ end_line_starting_block (ELEMENT *current)
               || current->args.list[0]->contents.number == 0))
         {
           ELEMENT *e;
+          ELEMENT *block_line_arg;
+          if (last_args_child(current)
+              && last_args_child(current)->type == ET_block_line_arg)
+            {
+              block_line_arg = last_args_child(current);
+            }
+          else
+            {
+              block_line_arg = new_element (ET_block_line_arg);
+              insert_into_args (current, block_line_arg, 0);
+            }
 
           e = new_element (ET_command_as_argument_inserted);
           e->cmd = CM_bullet;
-          insert_into_args (current, e, 0);
+          insert_into_contents (block_line_arg, e, 0);
           add_extra_element (current, "command_as_argument", e);
         }
       else if (item_line_command (current->cmd)
diff --git a/tp/t/results/coverage/formats_only_title_comments.pl 
b/tp/t/results/coverage/formats_only_title_comments.pl
index d6e1ae46a4..18c15a0ca4 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -12,10 +12,16 @@ $result_trees{'formats_only_title_comments'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -574,6 +580,7 @@ $result_trees{'formats_only_title_comments'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0];
@@ -585,7 +592,7 @@ 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
diff --git a/tp/t/results/coverage/formats_only_titles.pl 
b/tp/t/results/coverage/formats_only_titles.pl
index 2b60595296..eaeca5e7e8 100644
--- a/tp/t/results/coverage/formats_only_titles.pl
+++ b/tp/t/results/coverage/formats_only_titles.pl
@@ -12,10 +12,16 @@ $result_trees{'formats_only_titles'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -466,6 +472,7 @@ $result_trees{'formats_only_titles'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0];
@@ -475,7 +482,7 @@ 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[1
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
diff --git a/tp/t/results/coverage/formats_titles.pl 
b/tp/t/results/coverage/formats_titles.pl
index 14bb51ce4a..0003643bc8 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -12,10 +12,16 @@ $result_trees{'formats_titles'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -675,6 +681,7 @@ $result_trees{'formats_titles'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0];
@@ -687,7 +694,7 @@ 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'pa
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
diff --git a/tp/t/results/coverage/item_container.pl 
b/tp/t/results/coverage/item_container.pl
index 7a807bd5fa..d8d044206d 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -225,10 +225,16 @@ $result_trees{'item_container'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -344,6 +350,7 @@ 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'item_container'}{'contents'}[0];
 $result_trees{'item_container'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'item_container'}{'contents'}[0];
+$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5];
@@ -353,7 +360,7 @@ 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'pa
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5];
-$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'args'}[0];
+$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 $result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'item_container'}{'contents'}[0];
 $result_trees{'item_container'}{'contents'}[0]{'parent'} = 
$result_trees{'item_container'};
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index d65840ccfe..855f827936 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -142,10 +142,16 @@ $result_trees{'simple_menu'} = {
                         {
                           'args' => [
                             {
-                              'cmdname' => 'bullet',
-                              'contents' => [],
+                              'contents' => [
+                                {
+                                  'cmdname' => 'bullet',
+                                  'contents' => [],
+                                  'parent' => {},
+                                  'type' => 'command_as_argument_inserted'
+                                }
+                              ],
                               'parent' => {},
-                              'type' => 'command_as_argument_inserted'
+                              'type' => 'block_line_arg'
                             }
                           ],
                           'cmdname' => 'itemize',
@@ -347,10 +353,16 @@ $result_trees{'simple_menu'} = {
             {
               'args' => [
                 {
-                  'cmdname' => 'bullet',
-                  'contents' => [],
+                  'contents' => [
+                    {
+                      'cmdname' => 'bullet',
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'command_as_argument_inserted'
+                    }
+                  ],
                   'parent' => {},
-                  'type' => 'command_as_argument_inserted'
+                  'type' => 'block_line_arg'
                 }
               ],
               'cmdname' => 'itemize',
@@ -528,10 +540,16 @@ $result_trees{'simple_menu'} = {
             {
               'args' => [
                 {
-                  'cmdname' => 'bullet',
-                  'contents' => [],
+                  'contents' => [
+                    {
+                      'cmdname' => 'bullet',
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'command_as_argument_inserted'
+                    }
+                  ],
                   'parent' => {},
-                  'type' => 'command_as_argument_inserted'
+                  'type' => 'block_line_arg'
                 }
               ],
               'cmdname' => 'itemize',
@@ -902,10 +920,16 @@ $result_trees{'simple_menu'} = {
                             {
                               'args' => [
                                 {
-                                  'cmdname' => 'bullet',
-                                  'contents' => [],
+                                  'contents' => [
+                                    {
+                                      'cmdname' => 'bullet',
+                                      'contents' => [],
+                                      'parent' => {},
+                                      'type' => 'command_as_argument_inserted'
+                                    }
+                                  ],
                                   'parent' => {},
-                                  'type' => 'command_as_argument_inserted'
+                                  'type' => 'block_line_arg'
                                 }
                               ],
                               'cmdname' => 'itemize',
@@ -1107,10 +1131,16 @@ $result_trees{'simple_menu'} = {
                 {
                   'args' => [
                     {
-                      'cmdname' => 'bullet',
-                      'contents' => [],
+                      'contents' => [
+                        {
+                          'cmdname' => 'bullet',
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'command_as_argument_inserted'
+                        }
+                      ],
                       'parent' => {},
-                      'type' => 'command_as_argument_inserted'
+                      'type' => 'block_line_arg'
                     }
                   ],
                   'cmdname' => 'itemize',
@@ -1288,10 +1318,16 @@ $result_trees{'simple_menu'} = {
                 {
                   'args' => [
                     {
-                      'cmdname' => 'bullet',
-                      'contents' => [],
+                      'contents' => [
+                        {
+                          'cmdname' => 'bullet',
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'command_as_argument_inserted'
+                        }
+                      ],
                       'parent' => {},
-                      'type' => 'command_as_argument_inserted'
+                      'type' => 'block_line_arg'
                     }
                   ],
                   'cmdname' => 'itemize',
@@ -1713,6 +1749,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[0]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
@@ -1722,7 +1759,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0];
@@ -1746,6 +1783,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
 $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2] = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
 $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3] = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
@@ -1755,7 +1793,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
@@ -1772,6 +1810,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[4]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
@@ -1781,7 +1820,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0];
@@ -1837,6 +1876,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[0]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
@@ -1846,7 +1886,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0];
@@ -1870,6 +1910,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[2]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4];
@@ -1879,7 +1920,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5];
@@ -1896,6 +1937,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5]{'contents'}[3]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5]{'contents'}[4]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6];
@@ -1905,7 +1947,7 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[7]{'contents'}[0];
diff --git 
a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 
b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
index eee2f1540b..a4dfcd1b57 100644
--- a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
+++ b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
@@ -93,10 +93,16 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                     {
                       'args' => [
                         {
-                          'cmdname' => 'bullet',
-                          'contents' => [],
+                          'contents' => [
+                            {
+                              'cmdname' => 'bullet',
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'command_as_argument_inserted'
+                            }
+                          ],
                           'parent' => {},
-                          'type' => 'command_as_argument_inserted'
+                          'type' => 'block_line_arg'
                         }
                       ],
                       'cmdname' => 'itemize',
@@ -353,6 +359,7 @@ 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
@@ -363,7 +370,7 @@ 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl 
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index 6224fb4862..56f39d62b0 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -12,13 +12,14 @@ $result_trees{'comment_first_on_itemize_line'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
-              'parent' => {},
-              'type' => 'command_as_argument_inserted'
-            },
-            {
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'extra' => {
                 'comment_at_end' => {
                   'args' => [
@@ -121,17 +122,17 @@ $result_trees{'comment_first_on_itemize_line'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'extra'}{'comment_at_end'};
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0];
 $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_first_on_itemize_line'};
diff --git a/tp/t/results/itemize/headitem_itemx_in_itemize.pl 
b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
index be2728c022..eaba4ecf91 100644
--- a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
@@ -12,10 +12,16 @@ $result_trees{'headitem_itemx_in_itemize'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -148,6 +154,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0];
@@ -163,7 +170,7 @@ 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0];
-$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
 $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'parent'} = 
$result_trees{'headitem_itemx_in_itemize'};
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index 5cf041fe50..165ed9f421 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -589,10 +589,16 @@ $result_trees{'inter_item_commands_in_itemize'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -841,6 +847,7 @@ 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'e
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5];
@@ -862,7 +869,7 @@ 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'c
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'args'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
 $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'parent'} = 
$result_trees{'inter_item_commands_in_itemize'};
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl 
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index ee3cd1a3c2..2924c5e50c 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -499,10 +499,16 @@ $result_trees{'itemize_and_empty_lines'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -1601,6 +1607,7 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
@@ -1669,7 +1676,7 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[7];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[7];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
diff --git a/tp/t/results/itemize/not_closed_item.pl 
b/tp/t/results/itemize/not_closed_item.pl
index 12ed9c747c..140da410b0 100644
--- a/tp/t/results/itemize/not_closed_item.pl
+++ b/tp/t/results/itemize/not_closed_item.pl
@@ -12,10 +12,16 @@ $result_trees{'not_closed_item'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -73,13 +79,14 @@ $result_trees{'not_closed_item'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0];
-$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'not_closed_item'}{'contents'}[0];
 $result_trees{'not_closed_item'}{'contents'}[0]{'parent'} = 
$result_trees{'not_closed_item'};
 
diff --git a/tp/t/results/itemize/not_closed_itemize.pl 
b/tp/t/results/itemize/not_closed_itemize.pl
index 9d6cf220e3..0e0074508a 100644
--- a/tp/t/results/itemize/not_closed_itemize.pl
+++ b/tp/t/results/itemize/not_closed_itemize.pl
@@ -12,10 +12,16 @@ $result_trees{'not_closed_itemize'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -47,10 +53,11 @@ $result_trees{'not_closed_itemize'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0];
-$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = $result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'not_closed_itemize'}{'contents'}[0];
 $result_trees{'not_closed_itemize'}{'contents'}[0]{'parent'} = 
$result_trees{'not_closed_itemize'};
 
diff --git a/tp/t/results/latex_tests/nested_itemize.pl 
b/tp/t/results/latex_tests/nested_itemize.pl
index c61ee3d088..7306ae754a 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -47,10 +47,16 @@ $result_trees{'nested_itemize'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -122,10 +128,16 @@ $result_trees{'nested_itemize'} = {
                 {
                   'args' => [
                     {
-                      'cmdname' => 'bullet',
-                      'contents' => [],
+                      'contents' => [
+                        {
+                          'cmdname' => 'bullet',
+                          'contents' => [],
+                          'parent' => {},
+                          'type' => 'command_as_argument_inserted'
+                        }
+                      ],
                       'parent' => {},
-                      'type' => 'command_as_argument_inserted'
+                      'type' => 'block_line_arg'
                     }
                   ],
                   'cmdname' => 'itemize',
@@ -197,10 +209,16 @@ $result_trees{'nested_itemize'} = {
                         {
                           'args' => [
                             {
-                              'cmdname' => 'bullet',
-                              'contents' => [],
+                              'contents' => [
+                                {
+                                  'cmdname' => 'bullet',
+                                  'contents' => [],
+                                  'parent' => {},
+                                  'type' => 'command_as_argument_inserted'
+                                }
+                              ],
                               'parent' => {},
-                              'type' => 'command_as_argument_inserted'
+                              'type' => 'block_line_arg'
                             }
                           ],
                           'cmdname' => 'itemize',
@@ -272,10 +290,16 @@ $result_trees{'nested_itemize'} = {
                                 {
                                   'args' => [
                                     {
-                                      'cmdname' => 'bullet',
-                                      'contents' => [],
+                                      'contents' => [
+                                        {
+                                          'cmdname' => 'bullet',
+                                          'contents' => [],
+                                          'parent' => {},
+                                          'type' => 
'command_as_argument_inserted'
+                                        }
+                                      ],
                                       'parent' => {},
-                                      'type' => 'command_as_argument_inserted'
+                                      'type' => 'block_line_arg'
                                     }
                                   ],
                                   'cmdname' => 'itemize',
@@ -577,6 +601,7 @@ 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'ar
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0];
 $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested_itemize'}{'contents'}[0];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1];
@@ -588,6 +613,7 @@ 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'co
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1];
@@ -599,6 +625,7 @@ 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'co
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
@@ -610,6 +637,7 @@ 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'co
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
@@ -625,28 +653,28 @@ 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'co
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
 $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nested_itemize'}{'contents'}[0];
 $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested_itemize'}{'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 cf8231c3a3..625547c7a0 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -136,10 +136,16 @@ $result_trees{'block_commands_in_menu_description'} = {
                     {
                       'args' => [
                         {
-                          'cmdname' => 'bullet',
-                          'contents' => [],
+                          'contents' => [
+                            {
+                              'cmdname' => 'bullet',
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'command_as_argument_inserted'
+                            }
+                          ],
                           'parent' => {},
-                          'type' => 'command_as_argument_inserted'
+                          'type' => 'block_line_arg'
                         }
                       ],
                       'cmdname' => 'itemize',
@@ -611,6 +617,7 @@ 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
@@ -624,7 +631,7 @@ 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0];
diff --git a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl 
b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
index decee795fe..1482dace0f 100644
--- a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
+++ b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
@@ -24,10 +24,16 @@ $result_trees{'itemize_in_headitem_in_example'} = {
             {
               'args' => [
                 {
-                  'cmdname' => 'bullet',
-                  'contents' => [],
+                  'contents' => [
+                    {
+                      'cmdname' => 'bullet',
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'command_as_argument_inserted'
+                    }
+                  ],
                   'parent' => {},
-                  'type' => 'command_as_argument_inserted'
+                  'type' => 'block_line_arg'
                 }
               ],
               'cmdname' => 'itemize',
@@ -120,10 +126,16 @@ $result_trees{'itemize_in_headitem_in_example'} = {
             {
               'args' => [
                 {
-                  'cmdname' => 'bullet',
-                  'contents' => [],
+                  'contents' => [
+                    {
+                      'cmdname' => 'bullet',
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'command_as_argument_inserted'
+                    }
+                  ],
                   'parent' => {},
-                  'type' => 'command_as_argument_inserted'
+                  'type' => 'block_line_arg'
                 }
               ],
               'cmdname' => 'itemize',
@@ -236,10 +248,16 @@ $result_trees{'itemize_in_headitem_in_example'} = {
             {
               'args' => [
                 {
-                  'cmdname' => 'bullet',
-                  'contents' => [],
+                  'contents' => [
+                    {
+                      'cmdname' => 'bullet',
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'command_as_argument_inserted'
+                    }
+                  ],
                   'parent' => {},
-                  'type' => 'command_as_argument_inserted'
+                  'type' => 'block_line_arg'
                 }
               ],
               'cmdname' => 'itemize',
@@ -358,10 +376,16 @@ $result_trees{'itemize_in_headitem_in_example'} = {
             {
               'args' => [
                 {
-                  'cmdname' => 'bullet',
-                  'contents' => [],
+                  'contents' => [
+                    {
+                      'cmdname' => 'bullet',
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'command_as_argument_inserted'
+                    }
+                  ],
                   'parent' => {},
-                  'type' => 'command_as_argument_inserted'
+                  'type' => 'block_line_arg'
                 }
               ],
               'cmdname' => 'itemize',
@@ -547,6 +571,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
 };
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -557,11 +582,12 @@ 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
@@ -574,11 +600,12 @@ 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
@@ -592,11 +619,12 @@ 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
@@ -612,7 +640,7 @@ 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3]{'args'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8];
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 1dd513c313..f95ad54a3d 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -12,10 +12,16 @@ $result_trees{'long_uref_after_item'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -134,6 +140,7 @@ $result_trees{'long_uref_after_item'} = {
   ],
   'type' => 'document_root'
 };
+$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]{'extra'}{'command'}
 = $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0];
@@ -148,7 +155,7 @@ 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0];
-$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'long_uref_after_item'}{'contents'}[0];
 $result_trees{'long_uref_after_item'}{'contents'}[0]{'parent'} = 
$result_trees{'long_uref_after_item'};
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index 688c14fb32..1fd44d14c9 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -12,10 +12,16 @@ $result_trees{'comments_end_lines'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'parent' => {},
-              'type' => 'command_as_argument_inserted'
+              'type' => 'block_line_arg'
             }
           ],
           'cmdname' => 'itemize',
@@ -1056,6 +1062,7 @@ $result_trees{'comments_end_lines'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0];
@@ -1067,7 +1074,7 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl 
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index 22f9c0a5c0..8d96ea9a40 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -12,13 +12,14 @@ $result_trees{'comments_on_block_command_lines'} = {
         {
           'args' => [
             {
-              'cmdname' => 'bullet',
-              'contents' => [],
-              'parent' => {},
-              'type' => 'command_as_argument_inserted'
-            },
-            {
-              'contents' => [],
+              'contents' => [
+                {
+                  'cmdname' => 'bullet',
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'command_as_argument_inserted'
+                }
+              ],
               'extra' => {
                 'comment_at_end' => {
                   'args' => [
@@ -2321,17 +2322,17 @@ $result_trees{'comments_on_block_command_lines'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'extra'}{'comment_at_end'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
@@ -2767,7 +2768,8 @@ $result_floats{'comments_on_block_command_lines'} = {
 
 
 
-$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize 
commandarg="bullet" spaces=" " endspaces=" 
"><itemprepend>&bullet;</itemprepend><listitem spaces=" 
"><prepend>&bullet;</prepend><para>itemize it
+$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize 
commandarg="bullet" spaces=" " endspaces=" 
"><itemprepend>&bullet;</itemprepend><!-- c comm -->
+<listitem spaces=" "><prepend>&bullet;</prepend><para>itemize it
 </para></listitem></itemize>
 
 <itemize spaces=" " endspaces=" "><itemprepend>x </itemprepend><!-- c comm -->