texinfo-commits
[Top][All Lists]
Advanced

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

[8162] comment_at_end extra value


From: gavinsmith0123
Subject: [8162] comment_at_end extra value
Date: Tue, 11 Sep 2018 16:49:04 -0400 (EDT)

Revision: 8162
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8162
Author:   gavin
Date:     2018-09-11 16:49:04 -0400 (Tue, 11 Sep 2018)
Log Message:
-----------
comment_at_end extra value

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Converter.pm
    trunk/tp/Texinfo/Convert/DocBook.pm
    trunk/tp/Texinfo/Convert/Texinfo.pm
    trunk/tp/Texinfo/Convert/TexinfoXML.pm
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/alias/simple.pl
    trunk/tp/t/results/columnfractions/empty_comment.pl
    trunk/tp/t/results/columnfractions/good_comment.pl
    trunk/tp/t/results/columnfractions/good_space_comment.pl
    
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
    trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl
    trunk/tp/t/results/coverage/comment_on_cartouche_line.pl
    trunk/tp/t/results/coverage/comment_on_group_line.pl
    trunk/tp/t/results/coverage/formats_only_title_comments.pl
    trunk/tp/t/results/coverage/table.pl
    trunk/tp/t/results/coverage/table_command_comment.pl
    trunk/tp/t/results/float/comment_space_comand_in_float.pl
    trunk/tp/t/results/include/include_setfilename_on_setfilename_line.pl
    trunk/tp/t/results/indices/encoding_index_latin1.pl
    trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
    trunk/tp/t/results/indices/encoding_index_utf8.pl
    trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
    trunk/tp/t/results/invalid_nestings/center.pl
    trunk/tp/t/results/invalid_nestings/in_table.pl
    trunk/tp/t/results/invalid_nestings/on_block_command_line.pl
    trunk/tp/t/results/invalid_nestings/on_index_entry_line.pl
    trunk/tp/t/results/invalid_nestings/on_itemize_line.pl
    trunk/tp/t/results/invalid_nestings/on_node_line.pl
    trunk/tp/t/results/invalid_nestings/on_section_line.pl
    trunk/tp/t/results/invalid_nestings/on_subheading_line.pl
    trunk/tp/t/results/itemize/accent_argument.pl
    trunk/tp/t/results/itemize/comment_first_on_enumerate_line.pl
    trunk/tp/t/results/itemize/comment_first_on_itemize_line.pl
    trunk/tp/t/results/itemize/enumerate_argument.pl
    trunk/tp/t/results/itemize/enumerate_argument_item.pl
    trunk/tp/t/results/menu/comment_on_menu_line.pl
    trunk/tp/t/results/misc_commands/bad_documentlanguage.pl
    trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl
    trunk/tp/t/results/misc_commands/setfilename.pl
    trunk/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
    trunk/tp/t/results/quotation/comment_on_quotation_line.pl
    trunk/tp/t/results/quotation/only_comment_on_quotation_line.pl
    trunk/tp/t/results/raw/misc_raw_comments.pl
    trunk/tp/t/results/sectioning/empty_nodes_with_commands.pl
    trunk/tp/t/results/sectioning/empty_ref_arg.pl
    trunk/tp/t/results/sectioning/node.pl
    trunk/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
    trunk/tp/t/results/value/set_in_item_missing_line.pl
    trunk/tp/t/results/value/set_on_item_line.pl
    trunk/tp/t/results/xml_tests/comments_end_lines.pl
    trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
    trunk/tp/t/results/xml_tests/comments_on_misc_command_line.pl
    trunk/tp/t/results/xml_tests/raw_and_comments.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/ChangeLog     2018-09-11 20:49:04 UTC (rev 8162)
@@ -1,3 +1,23 @@
+2018-09-11  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Parser.pm (_isolate_last_space): If @c or @comment 
+       is the last in the line, remove it from the 'args' and store it
+       as 'comment_at_end' extra value.
+
+       * tp/Texinfo/Convert/TexinfoXML.pm ():
+       (_end_line_spaces): Do not handle the case of a comment being in 
+       the 'args'.
+       (_convert) <@item or @itemx in @table>: Check for and output a 
+       comment.
+
+       * tp/Texinfo/Convert/Converter.pm (_end_line_or_comment)
+       (_tree_without_comment, _convert_argument_and_end_line):
+       Meaning of arguments changed.  Check for a comment in the new 
+       location.  Callers updated.
+
+       * tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi): 
+       Check for and output a comment.
+
 2018-09-09  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_end_line) <@multitable>:

Modified: trunk/tp/Texinfo/Convert/Converter.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Converter.pm       2018-09-09 16:03:26 UTC (rev 
8161)
+++ trunk/tp/Texinfo/Convert/Converter.pm       2018-09-11 20:49:04 UTC (rev 
8162)
@@ -1026,16 +1026,19 @@
 sub _end_line_or_comment($$)
 {
   my $self = shift;
-  my $contents_possible_comment = shift;
+  my $root = shift;
+
   my $end_line;
-  if ($contents_possible_comment
-      and $contents_possible_comment->[-1]->{'cmdname'}
-      and ($contents_possible_comment->[-1]->{'cmdname'} eq 'c'
-          or $contents_possible_comment->[-1]->{'cmdname'} eq 'comment')) {
-    $end_line = $self->convert_tree($contents_possible_comment->[-1]);
-  } elsif ($contents_possible_comment      
-           and $contents_possible_comment->[-1]->{'text'}) {
-    my $text = $contents_possible_comment->[-1]->{'text'};
+
+  my $comment = $root->{'extra'}->{'comment_at_end'}
+    if $root->{'extra'};
+
+  if ($comment) {
+    $end_line = $self->convert_tree($comment);
+  } elsif ($root->{'args'}->[-1]->{'contents'}
+            and $root->{'args'}->[-1]->{'contents'}->[-1]
+            and $root->{'args'}->[-1]->{'contents'}->[-1]->{'text'}) {
+    my $text = $root->{'args'}->[-1]->{'contents'}->[-1]->{'text'};
     if (chomp($text)) {
       $end_line = "\n";
     } else {
@@ -1049,25 +1052,13 @@
 
 sub _tree_without_comment($)
 {
-  my $contents_possible_comment = shift;
-  my $comment;
-  my $tree;
+  my $root = shift;
 
-  if ($contents_possible_comment->{'contents'}
-      and $contents_possible_comment->{'contents'}->[-1]->{'cmdname'}
-      and ($contents_possible_comment->{'contents'}->[-1]->{'cmdname'} eq 'c'
-           or $contents_possible_comment->{'contents'}->[-1]->{'cmdname'} eq 
'comment')) {
-    my @contents = @{$contents_possible_comment->{'contents'}};
-    $comment = pop @contents;
-    $tree = {'contents' => address@hidden;
-    # FIXME why this selection, and not everything?
-    foreach my $key ('extra', 'type', 'cmdname', 'parent', 'line_nr') {
-      $tree->{$key} = $contents_possible_comment->{$key}
-        if (exists($contents_possible_comment->{$key}));
-    }
-  } else {
-   $tree = $contents_possible_comment;
-  }
+  my $comment = $root->{'extra'}->{'comment_at_end'}
+    if $root->{'extra'};
+
+  my $tree = $root->{'args'}->[-1];
+
   return ($comment, $tree);
 }
 

Modified: trunk/tp/Texinfo/Convert/DocBook.pm
===================================================================
--- trunk/tp/Texinfo/Convert/DocBook.pm 2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/Texinfo/Convert/DocBook.pm 2018-09-11 20:49:04 UTC (rev 8162)
@@ -595,7 +595,7 @@
     } elsif ($root->{'type'} and $root->{'type'} eq 'index_entry_command') {
       my $end_line;
       if ($root->{'args'}->[0]) {
-        $end_line = 
$self->_end_line_or_comment($root->{'args'}->[0]->{'contents'});
+        $end_line = $self->_end_line_or_comment($root);
         if ($self->{'document_context'}->[-1]->{'in_preformatted'}) {
           chomp($end_line);
         }
@@ -657,8 +657,7 @@
           }
           $result .= "<$command${attribute}>\n";
           if ($root->{'args'} and $root->{'args'}->[0]) {
-            my ($arg, $end_line)
-              = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+            my ($arg, $end_line) = 
$self->_convert_argument_and_end_line($root);
             $result .= "<title>$arg</title>$end_line";
             chomp ($result);
             $result .= "\n";
@@ -668,8 +667,7 @@
           }
         } elsif ($Texinfo::Common::sectioning_commands{$root->{'cmdname'}}) {
           if ($root->{'args'} and $root->{'args'}->[0]) {
-            my ($arg, $end_line)
-              = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+            my ($arg, $end_line) = 
$self->_convert_argument_and_end_line($root);
             $result .= 
               "<bridgehead 
renderas=\"$docbook_sections{$root->{'cmdname'}}\">$arg</bridgehead>$end_line";
             chomp ($result);
@@ -681,7 +679,7 @@
           my $attribute = '';
           if (defined($command)) {
             my ($arg, $end_line)
-              = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+              = $self->_convert_argument_and_end_line($root);
             if ($command eq '') {
               $result .= "$arg$end_line";
             } else {

Modified: trunk/tp/Texinfo/Convert/Texinfo.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Texinfo.pm 2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/Texinfo/Convert/Texinfo.pm 2018-09-11 20:49:04 UTC (rev 8162)
@@ -222,6 +222,8 @@
       if $cmd->{'extra'} and $cmd->{'extra'}->{'spaces_before_argument'};
   }
   $result .= '{'.$cmd->{'type'}.'}' if ($cmdname eq 'value');
+  $result .= convert($cmd->{'extra'}->{'comment_at_end'}, $fix)
+     if $cmd->{'extra'} and $cmd->{'extra'}->{'comment_at_end'};
   return $result;
 }
 

Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm      2018-09-09 16:03:26 UTC (rev 
8161)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm      2018-09-11 20:49:04 UTC (rev 
8162)
@@ -611,21 +611,15 @@
   my $type = shift;
 
   my $end_spaces = undef;
-  if ($root->{'args'}->[-1]->{'contents'}) {
-    my $index = -1;
-    if ($root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'}
-        and ($root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'} eq 'c' 
-             or $root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'} eq 
'comment')) {
-      $index = -2;
-    }
-    if ($root->{'args'}->[-1]->{'contents'}->[$index]
-        and $root->{'args'}->[-1]->{'contents'}->[$index]->{'type'}
-        and $root->{'args'}->[-1]->{'contents'}->[$index]->{'type'} eq $type
-        and defined($root->{'args'}->[-1]->{'contents'}->[$index]->{'text'})
-        and $root->{'args'}->[-1]->{'contents'}->[$index]->{'text'} !~ /\S/) {
-      $end_spaces = $root->{'args'}->[-1]->{'contents'}->[$index]->{'text'};
-      chomp $end_spaces;
-    }
+  if ($root->{'args'}->[-1]
+      and $root->{'args'}->[-1]->{'contents'}
+      and $root->{'args'}->[-1]->{'contents'}->[-1]
+      and $root->{'args'}->[-1]->{'contents'}->[-1]->{'type'}
+      and $root->{'args'}->[-1]->{'contents'}->[-1]->{'type'} eq $type
+      and defined($root->{'args'}->[-1]->{'contents'}->[-1]->{'text'})
+      and $root->{'args'}->[-1]->{'contents'}->[-1]->{'text'} !~ /\S/) {
+    $end_spaces = $root->{'args'}->[-1]->{'contents'}->[-1]->{'text'};
+    chomp $end_spaces;
   }
   return $end_spaces;
 }
@@ -820,6 +814,9 @@
             if (defined($in_monospace_not_normal));
 
         $result .= $self->_convert($root->{'args'}->[0]);
+        if ($root->{'extra'} and $root->{'extra'}->{'comment_at_end'}) {
+          $result .= $self->_convert($root->{'extra'}->{'comment_at_end'});
+        }
         pop @{$self->{'document_context'}->[-1]->{'monospace'}} 
           if (defined($in_monospace_not_normal));
         chomp ($result);
@@ -854,7 +851,7 @@
       push @$attribute, _leading_spaces($root);
       my $end_line;
       if ($root->{'args'}->[0]) {
-        $end_line = 
$self->_end_line_or_comment($root->{'args'}->[0]->{'contents'});
+        $end_line = $self->_end_line_or_comment($root);
       } else {
         # May that happen?
         $end_line = '';
@@ -873,8 +870,7 @@
                   $root->{'extra'}->{'text_arg'});
           }
         }
-        my ($arg, $end_line)
-            = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+        my ($arg, $end_line) = $self->_convert_argument_and_end_line($root);
         push @$attribute, _leading_spaces($root);
         return $self->open_element($command, $attribute).$arg
                 .$self->close_element($command).${end_line};
@@ -938,7 +934,7 @@
           my $end_line;
           if ($root->{'args'}->[0]) {
             $end_line 
-              = 
$self->_end_line_or_comment($root->{'args'}->[-1]->{'contents'});
+              = $self->_end_line_or_comment($root);
           } else {
             $end_line = "\n";
           }
@@ -962,8 +958,7 @@
           }
 
           if ($root->{'args'} and $root->{'args'}->[0]) {
-            my ($arg, $end_line)
-              = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+            my ($arg, $end_line) = 
$self->_convert_argument_and_end_line($root);
             $result .= $self->open_element('sectiontitle').$arg
                       .$self->close_element('sectiontitle')
                       .$closed_section_element.$end_line;
@@ -977,8 +972,7 @@
               and defined($root->{'extra'}->{'type'}->{'normalized'})) {
             unshift @$attribute, ('type', 
$root->{'extra'}->{'type'}->{'normalized'});
           }
-          my ($arg, $end_line)
-            = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+          my ($arg, $end_line) = $self->_convert_argument_and_end_line($root);
           return $self->open_element($command, ${attribute}).$arg
                .$self->close_element($command).$end_line;
         }
@@ -1086,9 +1080,8 @@
         }
         my $end_line;
         if ($root->{'args'}->[0]) {
-          $end_line = $self->_end_line_or_comment(
-                                         $root->{'args'}->[0]->{'contents'});
-          push @$attribute, $self->_texinfo_line($root->{'args'}->[0]);
+          $end_line = $self->_end_line_or_comment($root);
+          push @$attribute, $self->_texinfo_line($root);
         } else {
           $end_line = "\n";
         }
@@ -1327,7 +1320,7 @@
                 if ($arg_index+1 eq scalar(@{$root->{'args'}})) {
                   # last argument
                   ($arg, $end_line) 
-                    = 
$self->_convert_argument_and_end_line($root->{'args'}->[$arg_index]);
+                    = $self->_convert_argument_and_end_line($root);
                 } else {
                   $arg = $self->_convert($root->{'args'}->[$arg_index]);
                 }
@@ -1415,8 +1408,7 @@
                   $first_proto = 0;
                 }
                 $result .= $self->close_element('columnprototypes');
-                $contents_possible_comment 
-                  = $root->{'args'}->[-1]->{'contents'};
+                $contents_possible_comment = $root;
               } elsif ($root->{'extra'}
                          and $root->{'extra'}->{'columnfractions'}) {
                 my $cmd;
@@ -1427,7 +1419,7 @@
                     last;
                   }
                 }
-                my $attribute = [$self->_texinfo_line($cmd->{'args'}->[0])];
+                my $attribute = [$self->_texinfo_line($cmd)];
                 $result .= $self->open_element('columnfractions', $attribute);
                 foreach my $fraction 
(@{$root->{'extra'}->{'columnfractions'}}) {
                   $result .= $self->open_element('columnfraction', 
@@ -1435,11 +1427,7 @@
                              .$self->close_element('columnfraction');
                 }
                 $result .= $self->close_element('columnfractions');
-                $contents_possible_comment 
-                  = 
$root->{'args'}->[-1]->{'contents'}->[-1]->{'args'}->[-1]->{'contents'}
-                    if ($root->{'args'}->[-1]->{'contents'}
-                        and $root->{'args'}->[-1]->{'contents'}->[-1]->{'args'}
-                        and 
$root->{'args'}->[-1]->{'contents'}->[-1]->{'args'}->[-1]->{'contents'});
+                $contents_possible_comment = $cmd;
               } else { # bogus multitable
                 $result .= "\n";
               }
@@ -1454,8 +1442,7 @@
                 #print STDERR "NOT xtable: $root->{'cmdname'}\n" 
                 #  if 
(!$Texinfo::Common::item_line_commands{$root->{'cmdname'}});
               }
-              $contents_possible_comment = $root->{'args'}->[-1]->{'contents'}
-                if ($root->{'args'}->[-1]->{'contents'});
+              $contents_possible_comment = $root;
             }
             $end_line .= 
$self->_end_line_or_comment($contents_possible_comment);
           }
@@ -1610,9 +1597,8 @@
         my $end_spaces = _end_line_spaces($end_command, 'spaces_at_end');
         $end_line .= $end_spaces if (defined($end_spaces));
         $end_line 
-         .= 
$self->_end_line_or_comment($end_command->{'args'}->[0]->{'contents'})
-           if ($end_command->{'args'}->[0]
-               and $end_command->{'args'}->[0]->{'contents'});
+         .= $self->_end_line_or_comment($end_command)
+          if ($end_command->{'args'});
       } else {
         #$end_line = "\n";
       }

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/Texinfo/Parser.pm  2018-09-11 20:49:04 UTC (rev 8162)
@@ -2188,43 +2188,40 @@
   my $end_spaces;
   $type = 'spaces_at_end' if (!defined($type));
 
-  if ($current->{'contents'} and @{$current->{'contents'}}) {
-    my $index = -1;
-    # we ignore space before a misc command that is last on line.
-    # This is primarily to tag spaces before comments, but this will
-    # also tag and, in most converter lead to removal of spaces
-    # before any misc command, which is not really problematic as 
-    # in most cases, if it is not a comment, we are in an invalid 
-    # nesting of misc command on another @-command line.
-    $index = -2 
-      if (scalar(@{$current->{'contents'}}) > 1 
-        and $current->{'contents'}->[-1]->{'cmdname'}
-        and 
$self->{'misc_commands'}->{$current->{'contents'}->[-1]->{'cmdname'}});
+  return if (!$current->{'contents'} or address@hidden>{'contents'}});
 
-    if (defined($current->{'contents'}->[$index]->{'text'}) 
-        and !$current->{'contents'}->[$index]->{'type'}
-        and $current->{'contents'}->[$index]->{'text'} =~ /\s+$/) {
-      if ($current->{'contents'}->[$index]->{'text'} !~ /\S/) {
-        if ($index == -1 and $current->{'type'} eq 'brace_command_arg') {
-          $end_spaces = $current->{'contents'}->[$index]->{'text'};
-          pop @{$current->{'contents'}};
-          $current->{'extra'}->{'spaces_after_argument'} = $end_spaces;
-        } else {
-          $current->{'contents'}->[$index]->{'type'} = $type;
-        }
+  # Store a final comment command in the 'extra' hash.
+  if (scalar(@{$current->{'contents'}}) >= 1 
+      and $current->{'contents'}->[-1]->{'cmdname'}
+      and ($current->{'contents'}->[-1]->{'cmdname'} eq 'c'
+            or $current->{'contents'}->[-1]->{'cmdname'} eq 'comment')) {
+     $current->{'parent'}->{'extra'}->{'comment_at_end'}
+       = pop @{$current->{'contents'}}; 
+  }
+
+  return if (address@hidden>{'contents'}}); 
+
+  if (defined($current->{'contents'}->[-1]->{'text'}) 
+      and !$current->{'contents'}->[-1]->{'type'}
+      and $current->{'contents'}->[-1]->{'text'} =~ /\s+$/) {
+    if ($current->{'contents'}->[-1]->{'text'} !~ /\S/) {
+      if ($current->{'type'} eq 'brace_command_arg') {
+        $end_spaces = $current->{'contents'}->[-1]->{'text'};
+        pop @{$current->{'contents'}};
+        $current->{'extra'}->{'spaces_after_argument'} = $end_spaces;
       } else {
-        $current->{'contents'}->[$index]->{'text'} =~ s/(\s+)$//;
-        $end_spaces = $1;
-        my $new_spaces = { 'text' => $end_spaces, 'parent' => $current,
-          'type' => $type };
-        if ($index == -1 and $current->{'type'} eq 'brace_command_arg') {
-          $current->{'extra'}->{'spaces_after_argument'} = $end_spaces;
-        } elsif ($index == -1) {
-          push @{$current->{'contents'}}, $new_spaces;
-        } else {
-          splice (@{$current->{'contents'}}, $index+1, 0, $new_spaces);
-        }
+        $current->{'contents'}->[-1]->{'type'} = $type;
       }
+    } else {
+      $current->{'contents'}->[-1]->{'text'} =~ s/(\s+)$//;
+      $end_spaces = $1;
+      my $new_spaces = { 'text' => $end_spaces, 'parent' => $current,
+        'type' => $type };
+      if ($current->{'type'} eq 'brace_command_arg') {
+        $current->{'extra'}->{'spaces_after_argument'} = $end_spaces;
+      } else {
+        push @{$current->{'contents'}}, $new_spaces;
+      }
     }
   }
 }

Modified: trunk/tp/t/results/alias/simple.pl
===================================================================
--- trunk/tp/t/results/alias/simple.pl  2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/alias/simple.pl  2018-09-11 20:49:04 UTC (rev 8162)
@@ -59,24 +59,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -85,6 +67,24 @@
       ],
       'cmdname' => 'alias',
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'misc_args' => [
           'o-theralias',
           'verb'
@@ -198,9 +198,9 @@
 $result_trees{'simple'}{'contents'}[1]{'parent'} = $result_trees{'simple'};
 $result_trees{'simple'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[2]{'args'}[0];
 $result_trees{'simple'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[2]{'args'}[0];
-$result_trees{'simple'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[2]{'args'}[0];
 $result_trees{'simple'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[2];
+$result_trees{'simple'}{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'simple'}{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'} = 
$result_trees{'simple'}{'contents'}[2]{'args'}[0];
 $result_trees{'simple'}{'contents'}[2]{'parent'} = $result_trees{'simple'};
 $result_trees{'simple'}{'contents'}[3]{'parent'} = $result_trees{'simple'};
 $result_trees{'simple'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[4];

Modified: trunk/tp/t/results/columnfractions/empty_comment.pl
===================================================================
--- trunk/tp/t/results/columnfractions/empty_comment.pl 2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/columnfractions/empty_comment.pl 2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -14,26 +14,7 @@
             {
               'args' => [
                 {
-                  'contents' => [
-                    {
-                      'args' => [
-                        {
-                          'parent' => {},
-                          'text' => '
-',
-                          'type' => 'misc_arg'
-                        }
-                      ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          '
-'
-                        ]
-                      },
-                      'parent' => {}
-                    }
-                  ],
+                  'contents' => [],
                   'parent' => {},
                   'type' => 'misc_line_arg'
                 }
@@ -40,6 +21,24 @@
               ],
               'cmdname' => 'columnfractions',
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      '
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'missing_argument' => 1,
                 'spaces_before_argument' => ' '
               },
@@ -95,9 +94,9 @@
   ],
   'type' => 'text_root'
 };
-$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_comment'}{'contents'}[0]{'args'}[0];
 $result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'empty_comment'}{'contents'}[0];
 
$result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/columnfractions/good_comment.pl
===================================================================
--- trunk/tp/t/results/columnfractions/good_comment.pl  2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/columnfractions/good_comment.pl  2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -18,24 +18,6 @@
                     {
                       'parent' => {},
                       'text' => '0.4 .6 5.'
-                    },
-                    {
-                      'args' => [
-                        {
-                          'parent' => {},
-                          'text' => ' comment
-',
-                          'type' => 'misc_arg'
-                        }
-                      ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment
-'
-                        ]
-                      },
-                      'parent' => {}
                     }
                   ],
                   'parent' => {},
@@ -44,6 +26,24 @@
               ],
               'cmdname' => 'columnfractions',
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comment
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comment
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'misc_args' => [
                   '0.4',
                   '.6',
@@ -105,9 +105,9 @@
   'type' => 'text_root'
 };
 
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'good_comment'}{'contents'}[0]{'args'}[0];
 $result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'good_comment'}{'contents'}[0];
 
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/columnfractions/good_space_comment.pl
===================================================================
--- trunk/tp/t/results/columnfractions/good_space_comment.pl    2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/columnfractions/good_space_comment.pl    2018-09-11 
20:49:04 UTC (rev 8162)
@@ -23,24 +23,6 @@
                       'parent' => {},
                       'text' => '  ',
                       'type' => 'spaces_at_end'
-                    },
-                    {
-                      'args' => [
-                        {
-                          'parent' => {},
-                          'text' => ' space comment
-',
-                          'type' => 'misc_arg'
-                        }
-                      ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' space comment
-'
-                        ]
-                      },
-                      'parent' => {}
                     }
                   ],
                   'parent' => {},
@@ -49,6 +31,24 @@
               ],
               'cmdname' => 'columnfractions',
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' space comment
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' space comment
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'misc_args' => [
                   '0',
                   '1'
@@ -110,9 +110,9 @@
 };
 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0];
 $result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'good_space_comment'}{'contents'}[0];
 
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];

Modified: 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
===================================================================
--- 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 2018-09-09 16:03:26 UTC (rev 8161)
+++ 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 2018-09-11 20:49:04 UTC (rev 8162)
@@ -213,10 +213,10 @@
    *note ≥ ≤ →::
 
    *note ª º ★ £ ⊣ ¿ ®:: *note ⇒ ° a b a sunny day å:: *note Å æ œ Æ Œ ø
-Ø ß ł Ł Ð ð Þ þ:: *note ä ẽ î â à é ç ē e̊ e̋ ę:: *note ė ĕ e̲ ẹ ě j
-ee͡:: *note ı Ḕ Ḉ:: *note “ ” ‘ ’ „ ‚:: *note « » « » ‹ ›:: *note `` ''
---- -- ` ':: *note AAA (fff) AAA BBB:: *note CCC (rrr) CCC DDD:: *note
-the someone <address@hidden> <address@hidden>:: *note [f--ile1] [image 
src="f--ile.png" alt="alt" text="Image description\"\"\\."]:: *note
+Ø ß ł Ł Ð ð Þ þ:: *note ä ẽ î â à é ç ē e̊ e̋ ę:: *note ė ĕ e̲ ẹ ě j ee͡::
+*note ı Ḕ Ḉ:: *note “ ” ‘ ’ „ ‚:: *note « » « » ‹ ›:: *note `` '' --- --
+` ':: *note AAA (fff) AAA BBB:: *note CCC (rrr) CCC DDD:: *note the
+someone <address@hidden> <address@hidden>:: *note [f--ile1] [image 
src="f--ile.png" alt="alt" text="Image description\"\"\\."]:: *note
  @ {} . :: *note cite asis in @w b in r SC *str* t VAR dfn i:: *note env
 code option samp command file C-x <ESC>:: *note 8.27in:: *note sansserif
 slanted:: *note indicateurl:: *note _{g}H 3^{rd}:: *note

Modified: trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl
===================================================================
--- trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl  
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl  
2018-09-11 20:49:04 UTC (rev 8162)
@@ -122,24 +122,6 @@
                           'parent' => {},
                           'text' => ' ',
                           'type' => 'spaces_at_end'
-                        },
-                        {
-                          'args' => [
-                            {
-                              'parent' => {},
-                              'text' => ' comment
-',
-                              'type' => 'misc_arg'
-                            }
-                          ],
-                          'cmdname' => 'c',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment
-'
-                            ]
-                          },
-                          'parent' => {}
                         }
                       ],
                       'parent' => {},
@@ -148,6 +130,24 @@
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
+                    'comment_at_end' => {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => ' comment
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'c',
+                      'extra' => {
+                        'misc_args' => [
+                          ' comment
+'
+                        ]
+                      },
+                      'parent' => {}
+                    },
                     'index_entry' => {
                       'command' => {},
                       'content' => [
@@ -316,9 +316,9 @@
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'comment_at_end'};
+$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'};

Modified: trunk/tp/t/results/coverage/comment_on_cartouche_line.pl
===================================================================
--- trunk/tp/t/results/coverage/comment_on_cartouche_line.pl    2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/coverage/comment_on_cartouche_line.pl    2018-09-11 
20:49:04 UTC (rev 8162)
@@ -10,26 +10,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -81,6 +62,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -94,8 +93,6 @@
   ],
   'type' => 'text_root'
 };
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0];
 $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
@@ -103,6 +100,8 @@
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1];
 $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_on_cartouche_line'};
 

Modified: trunk/tp/t/results/coverage/comment_on_group_line.pl
===================================================================
--- trunk/tp/t/results/coverage/comment_on_group_line.pl        2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/coverage/comment_on_group_line.pl        2018-09-11 
20:49:04 UTC (rev 8162)
@@ -10,26 +10,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -81,6 +62,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -94,8 +93,6 @@
   ],
   'type' => 'text_root'
 };
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0];
 $result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'comment_on_group_line'}{'contents'}[0];
 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0];
 $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'comment_on_group_line'}{'contents'}[0];
@@ -103,6 +100,8 @@
 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1];
 $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'comment_on_group_line'}{'contents'}[0];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0];
 $result_trees{'comment_on_group_line'}{'contents'}[0]{'extra'}{'end_command'} 
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1];
 $result_trees{'comment_on_group_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_on_group_line'};
 

Modified: trunk/tp/t/results/coverage/formats_only_title_comments.pl
===================================================================
--- trunk/tp/t/results/coverage/formats_only_title_comments.pl  2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/coverage/formats_only_title_comments.pl  2018-09-11 
20:49:04 UTC (rev 8162)
@@ -118,26 +118,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment on enumerate line
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment on enumerate line
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -213,6 +194,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment on enumerate line
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment on enumerate line
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'enumerate_specification' => 1,
         'spaces_before_argument' => ' '
@@ -364,24 +363,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'space_at_end_block_command'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment on vtable line
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment on vtable line
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -447,6 +428,24 @@
           ]
         ],
         'command_as_argument' => {},
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment on vtable line
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment on vtable line
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -601,8 +600,6 @@
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'spaces_after_command_elt'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0];
 $result_trees{'formats_only_title_comments'}{'contents'}[0]{'parent'} = 
$result_trees{'formats_only_title_comments'};
 $result_trees{'formats_only_title_comments'}{'contents'}[1]{'parent'} = 
$result_trees{'formats_only_title_comments'};
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[2];
 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[0];
@@ -613,6 +610,8 @@
 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[2];
+$result_trees{'formats_only_title_comments'}{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'formats_only_title_comments'}{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1];
 $result_trees{'formats_only_title_comments'}{'contents'}[2]{'parent'} = 
$result_trees{'formats_only_title_comments'};
 $result_trees{'formats_only_title_comments'}{'contents'}[3]{'parent'} = 
$result_trees{'formats_only_title_comments'};
@@ -636,8 +635,6 @@
 $result_trees{'formats_only_title_comments'}{'contents'}[5]{'parent'} = 
$result_trees{'formats_only_title_comments'};
 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[6];
 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[0];
@@ -648,6 +645,8 @@
 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[6];
 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[6]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'extra'}{'comment_at_end'};
+$result_trees{'formats_only_title_comments'}{'contents'}[6]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1];
 $result_trees{'formats_only_title_comments'}{'contents'}[6]{'line_nr'} = 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'formats_only_title_comments'}{'contents'}[6]{'parent'} = 
$result_trees{'formats_only_title_comments'};

Modified: trunk/tp/t/results/coverage/table.pl
===================================================================
--- trunk/tp/t/results/coverage/table.pl        2018-09-09 16:03:26 UTC (rev 
8161)
+++ trunk/tp/t/results/coverage/table.pl        2018-09-11 20:49:04 UTC (rev 
8162)
@@ -208,24 +208,6 @@
               },
               'parent' => {},
               'type' => 'command_as_argument'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' samp
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' samp
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -438,24 +420,6 @@
                           'parent' => {},
                           'text' => ' ',
                           'type' => 'spaces_at_end'
-                        },
-                        {
-                          'args' => [
-                            {
-                              'parent' => {},
-                              'text' => ' comment in itemx line
-',
-                              'type' => 'misc_arg'
-                            }
-                          ],
-                          'cmdname' => 'comment',
-                          'extra' => {
-                            'misc_args' => [
-                              ' comment in itemx line
-'
-                            ]
-                          },
-                          'parent' => {}
                         }
                       ],
                       'parent' => {},
@@ -464,6 +428,24 @@
                   ],
                   'cmdname' => 'itemx',
                   'extra' => {
+                    'comment_at_end' => {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => ' comment in itemx line
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'comment',
+                      'extra' => {
+                        'misc_args' => [
+                          ' comment in itemx line
+'
+                        ]
+                      },
+                      'parent' => {}
+                    },
                     'index_entry' => {
                       'command' => {},
                       'content' => [
@@ -547,6 +529,24 @@
           ]
         ],
         'command_as_argument' => {},
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' samp
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' samp
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -587,8 +587,6 @@
 $result_trees{'table'}{'contents'}[1]{'parent'} = $result_trees{'table'};
 $result_trees{'table'}{'contents'}[2]{'parent'} = $result_trees{'table'};
 $result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'table'}{'contents'}[3]{'args'}[0];
-$result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'table'}{'contents'}[3]{'args'}[0];
 $result_trees{'table'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'table'}{'contents'}[3];
 
$result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[0];
 $result_trees{'table'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'table'}{'contents'}[3]{'contents'}[0];
@@ -623,9 +621,9 @@
 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'};
@@ -641,6 +639,8 @@
 $result_trees{'table'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'table'}{'contents'}[3];
 
$result_trees{'table'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
 = $result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 $result_trees{'table'}{'contents'}[3]{'extra'}{'command_as_argument'} = 
$result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'table'}{'contents'}[3]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[3]{'extra'}{'comment_at_end'};
+$result_trees{'table'}{'contents'}[3]{'extra'}{'comment_at_end'}{'parent'} = 
$result_trees{'table'}{'contents'}[3]{'args'}[0];
 $result_trees{'table'}{'contents'}[3]{'extra'}{'end_command'} = 
$result_trees{'table'}{'contents'}[3]{'contents'}[2];
 $result_trees{'table'}{'contents'}[3]{'line_nr'} = 
$result_trees{'table'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'table'}{'contents'}[3]{'parent'} = $result_trees{'table'};

Modified: trunk/tp/t/results/coverage/table_command_comment.pl
===================================================================
--- trunk/tp/t/results/coverage/table_command_comment.pl        2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/coverage/table_command_comment.pl        2018-09-11 
20:49:04 UTC (rev 8162)
@@ -21,24 +21,6 @@
               },
               'parent' => {},
               'type' => 'command_as_argument'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' in comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' in comment
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -126,6 +108,24 @@
           ]
         ],
         'command_as_argument' => {},
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' in comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' in comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -136,8 +136,6 @@
   'type' => 'text_root'
 };
 
$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0];
 $result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'table_command_comment'}{'contents'}[0];
 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -151,6 +149,8 @@
 $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'table_command_comment'}{'contents'}[0];
 
$result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0];
 $result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'end_command'} 
= $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1];
 $result_trees{'table_command_comment'}{'contents'}[0]{'line_nr'} = 
$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'table_command_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'table_command_comment'};

Modified: trunk/tp/t/results/float/comment_space_comand_in_float.pl
===================================================================
--- trunk/tp/t/results/float/comment_space_comand_in_float.pl   2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/float/comment_space_comand_in_float.pl   2018-09-11 
20:49:04 UTC (rev 8162)
@@ -64,24 +64,6 @@
                 {
                   'cmdname' => ' ',
                   'parent' => {}
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' float
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' float
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'extra' => {
@@ -148,6 +130,24 @@
                 {}
               ]
             ],
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' float
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' float
+'
+                ]
+              },
+              'parent' => {}
+            },
             'end_command' => {},
             'node_content' => [
               {},
@@ -188,24 +188,6 @@
                 {
                   'cmdname' => ' ',
                   'parent' => {}
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' listoffloats
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' listoffloats
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -214,6 +196,24 @@
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' listoffloats
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' listoffloats
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -264,8 +264,6 @@
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1];
-$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2];
-$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1];
@@ -277,6 +275,8 @@
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][1]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'block_command_line_contents'}[1][0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'block_command_line_contents'}[1][1]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
+$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
@@ -286,9 +286,9 @@
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'comment_space_comand_in_float'}{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0];
-$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3];
+$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'extra'}{'type'}{'content'}[1]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'comment_space_comand_in_float'}{'contents'}[1];
@@ -350,6 +350,15 @@
     {
       'cmdname' => 'float',
       'extra' => {
+        'comment_at_end' => {
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' float
+'
+            ]
+          }
+        },
         'end_command' => {
           'cmdname' => 'end',
           'extra' => {

Modified: trunk/tp/t/results/include/include_setfilename_on_setfilename_line.pl
===================================================================
--- trunk/tp/t/results/include/include_setfilename_on_setfilename_line.pl       
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/include/include_setfilename_on_setfilename_line.pl       
2018-09-11 20:49:04 UTC (rev 8162)
@@ -13,27 +13,17 @@
           'contents' => [
             {
               'parent' => {},
-              'text' => 'file'
+              'text' => 'file '
             },
             {
-              'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
-            },
-            {
               'args' => [
                 {
                   'contents' => [
                     {
                       'parent' => {},
-                      'text' => 'other file'
+                      'text' => 'other file '
                     },
                     {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
-                    },
-                    {
                       'args' => [
                         {
                           'contents' => [
@@ -96,18 +86,16 @@
   'type' => 'text_root'
 };
 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0];
-$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'};
-$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0];
-$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'line_nr'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'line_nr'}
 = 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'include_setfilename_on_setfilename_line'}{'contents'}[0]{'parent'}
 = $result_trees{'include_setfilename_on_setfilename_line'};
 
 $result_texis{'include_setfilename_on_setfilename_line'} = '@setfilename file 
@setfilename other file @include are you joking!

Modified: trunk/tp/t/results/indices/encoding_index_latin1.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_latin1.pl 2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/indices/encoding_index_latin1.pl 2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -163,7 +163,7 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'é é'
+                  'text' => "\x{e9} \x{e9}"
                 },
                 {
                   'parent' => {},

Modified: trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
2018-09-11 20:49:04 UTC (rev 8162)
@@ -163,7 +163,7 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'é é'
+                  'text' => "\x{e9} \x{e9}"
                 },
                 {
                   'parent' => {},

Modified: trunk/tp/t/results/indices/encoding_index_utf8.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_utf8.pl   2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/indices/encoding_index_utf8.pl   2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -163,7 +163,7 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'é é'
+                  'text' => "\x{e9} \x{e9}"
                 },
                 {
                   'parent' => {},

Modified: trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl   
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl   
2018-09-11 20:49:04 UTC (rev 8162)
@@ -163,7 +163,7 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'é é'
+                  'text' => "\x{e9} \x{e9}"
                 },
                 {
                   'parent' => {},

Modified: trunk/tp/t/results/invalid_nestings/center.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/center.pl       2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/invalid_nestings/center.pl       2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -140,14 +140,9 @@
           'contents' => [
             {
               'parent' => {},
-              'text' => 'center'
+              'text' => 'center '
             },
             {
-              'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
-            },
-            {
               'args' => [
                 {
                   'contents' => [
@@ -202,7 +197,6 @@
       'extra' => {
         'misc_content' => [
           {},
-          {},
           {}
         ],
         'spaces_before_argument' => ' '
@@ -282,14 +276,9 @@
           'contents' => [
             {
               'parent' => {},
-              'text' => 'center'
+              'text' => 'center '
             },
             {
-              'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
-            },
-            {
               'args' => [
                 {
                   'contents' => [
@@ -332,7 +321,6 @@
       'extra' => {
         'misc_content' => [
           {},
-          {},
           {}
         ],
         'spaces_before_argument' => ' '
@@ -1497,20 +1485,18 @@
 $result_trees{'center'}{'contents'}[0]{'parent'} = $result_trees{'center'};
 $result_trees{'center'}{'contents'}[1]{'parent'} = $result_trees{'center'};
 $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'center'}{'contents'}[2]{'args'}[0];
+$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
+$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'misc_content'}
 = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
 $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'center'}{'contents'}[2]{'args'}[0];
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'};
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'extra'}{'misc_content'}
 = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'};
-$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'center'}{'contents'}[2]{'args'}[0];
 $result_trees{'center'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'center'}{'contents'}[2];
 $result_trees{'center'}{'contents'}[2]{'extra'}{'misc_content'}[0] = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 $result_trees{'center'}{'contents'}[2]{'extra'}{'misc_content'}[1] = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[2]{'extra'}{'misc_content'}[2] = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'center'}{'contents'}[2]{'line_nr'} = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'center'}{'contents'}[2]{'line_nr'} = 
$result_trees{'center'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'center'}{'contents'}[2]{'parent'} = $result_trees{'center'};
 $result_trees{'center'}{'contents'}[3]{'parent'} = $result_trees{'center'};
 
$result_trees{'center'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'center'}{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -1525,17 +1511,15 @@
 $result_trees{'center'}{'contents'}[5]{'parent'} = $result_trees{'center'};
 $result_trees{'center'}{'contents'}[6]{'parent'} = $result_trees{'center'};
 $result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'center'}{'contents'}[7]{'args'}[0];
+$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1];
+$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'center'}{'contents'}[7]{'args'}[0];
-$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'center'}{'contents'}[7]{'args'}[0];
 $result_trees{'center'}{'contents'}[7]{'args'}[0]{'parent'} = 
$result_trees{'center'}{'contents'}[7];
 $result_trees{'center'}{'contents'}[7]{'extra'}{'misc_content'}[0] = 
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 $result_trees{'center'}{'contents'}[7]{'extra'}{'misc_content'}[1] = 
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[7]{'extra'}{'misc_content'}[2] = 
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'center'}{'contents'}[7]{'line_nr'} = 
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'center'}{'contents'}[7]{'line_nr'} = 
$result_trees{'center'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'center'}{'contents'}[7]{'parent'} = $result_trees{'center'};
 $result_trees{'center'}{'contents'}[8]{'parent'} = $result_trees{'center'};
 
$result_trees{'center'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -1791,12 +1775,12 @@
 
 $result_texts{'center'} = 'in titlefont 
 
-center
+center 
 
 
 in quotation
 
-centersecond center
+center second center
 
 in code in center
 

Modified: trunk/tp/t/results/invalid_nestings/in_table.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/in_table.pl     2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/invalid_nestings/in_table.pl     2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -258,8 +258,7 @@
                             },
                             {
                               'parent' => {},
-                              'text' => ' ',
-                              'type' => 'spaces_at_end'
+                              'text' => ' '
                             },
                             {
                               'args' => [
@@ -1329,7 +1328,7 @@
 $result_texts{'in_table'} = '
 
 
-in titlefont exdent
+in titlefont  exdent
 in item
 Top
 long title

Modified: trunk/tp/t/results/invalid_nestings/on_block_command_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_block_command_line.pl        
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/invalid_nestings/on_block_command_line.pl        
2018-09-11 20:49:04 UTC (rev 8162)
@@ -294,8 +294,7 @@
             },
             {
               'parent' => {},
-              'text' => ' ',
-              'type' => 'space_at_end_block_command'
+              'text' => ' '
             },
             {
               'args' => [

Modified: trunk/tp/t/results/invalid_nestings/on_index_entry_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_index_entry_line.pl  2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/invalid_nestings/on_index_entry_line.pl  2018-09-11 
20:49:04 UTC (rev 8162)
@@ -111,8 +111,7 @@
             },
             {
               'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
+              'text' => ' '
             },
             {
               'args' => [
@@ -168,7 +167,7 @@
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
           'index_type_command' => 'cindex',
-          'key' => 'in titlefont exdent
+          'key' => 'in titlefont  exdent
 ',
           'number' => 1
         },

Modified: trunk/tp/t/results/invalid_nestings/on_itemize_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_itemize_line.pl      2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/invalid_nestings/on_itemize_line.pl      2018-09-11 
20:49:04 UTC (rev 8162)
@@ -111,8 +111,7 @@
             },
             {
               'parent' => {},
-              'text' => ' ',
-              'type' => 'space_at_end_block_command'
+              'text' => ' '
             },
             {
               'args' => [

Modified: trunk/tp/t/results/invalid_nestings/on_node_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_node_line.pl 2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/invalid_nestings/on_node_line.pl 2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -188,8 +188,7 @@
             },
             {
               'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
+              'text' => ' '
             },
             {
               'args' => [
@@ -250,7 +249,7 @@
               {},
               {}
             ],
-            'normalized' => ''
+            'normalized' => '-'
           }
         ],
         'normalized' => 'a',
@@ -340,7 +339,7 @@
           }
         }
       ],
-      'normalized' => ''
+      'normalized' => '-'
     }
   }
 };

Modified: trunk/tp/t/results/invalid_nestings/on_section_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_section_line.pl      2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/invalid_nestings/on_section_line.pl      2018-09-11 
20:49:04 UTC (rev 8162)
@@ -120,8 +120,7 @@
             },
             {
               'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
+              'text' => ' '
             },
             {
               'args' => [
@@ -227,8 +226,8 @@
 ';
 
 
-$result_texts{'on_section_line'} = '1 Text in titlefont exdent
-==========================
+$result_texts{'on_section_line'} = '1 Text in titlefont  exdent
+===========================
 ';
 
 $result_sectioning{'on_section_line'} = {

Modified: trunk/tp/t/results/invalid_nestings/on_subheading_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_subheading_line.pl   2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/invalid_nestings/on_subheading_line.pl   2018-09-11 
20:49:04 UTC (rev 8162)
@@ -115,8 +115,7 @@
             },
             {
               'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
+              'text' => ' '
             },
             {
               'args' => [
@@ -219,8 +218,8 @@
 ';
 
 
-$result_texts{'on_subheading_line'} = 'Text in titlefont exdent
-------------------------
+$result_texts{'on_subheading_line'} = 'Text in titlefont  exdent
+-------------------------
 ';
 
 $result_errors{'on_subheading_line'} = [

Modified: trunk/tp/t/results/itemize/accent_argument.pl
===================================================================
--- trunk/tp/t/results/itemize/accent_argument.pl       2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/itemize/accent_argument.pl       2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -21,24 +21,6 @@
               },
               'parent' => {},
               'type' => 'command_as_argument'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => '
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  '
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -118,6 +100,24 @@
           ]
         ],
         'command_as_argument' => {},
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'comment',
+          'extra' => {
+            'misc_args' => [
+              '
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -239,8 +239,6 @@
   'type' => 'text_root'
 };
 
$result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0];
-$result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0];
 $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'accent_argument'}{'contents'}[0];
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0];
@@ -251,6 +249,8 @@
 $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'accent_argument'}{'contents'}[0];
 
$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0];
 
$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'command_as_argument'} 
= 
$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0];
 $result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'end_command'} = 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1];
 $result_trees{'accent_argument'}{'contents'}[0]{'line_nr'} = 
$result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'accent_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'accent_argument'};

Modified: trunk/tp/t/results/itemize/comment_first_on_enumerate_line.pl
===================================================================
--- trunk/tp/t/results/itemize/comment_first_on_enumerate_line.pl       
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/itemize/comment_first_on_enumerate_line.pl       
2018-09-11 20:49:04 UTC (rev 8162)
@@ -10,26 +10,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment on enumerate line
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment on enumerate line
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -96,6 +77,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment on enumerate line
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment on enumerate line
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'enumerate_specification' => 1,
         'spaces_before_argument' => ' '
@@ -110,8 +109,6 @@
   ],
   'type' => 'text_root'
 };
-$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'comment_first_on_enumerate_line'}{'contents'}[0];
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0];
@@ -120,6 +117,8 @@
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_first_on_enumerate_line'}{'contents'}[0];
+$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[1];
 $result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_first_on_enumerate_line'};
 

Modified: trunk/tp/t/results/itemize/comment_first_on_itemize_line.pl
===================================================================
--- trunk/tp/t/results/itemize/comment_first_on_itemize_line.pl 2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/itemize/comment_first_on_itemize_line.pl 2018-09-11 
20:49:04 UTC (rev 8162)
@@ -10,26 +10,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment on itemize line
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment on itemize line
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -107,6 +88,24 @@
           ]
         ],
         'command_as_argument' => {},
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment on itemize line
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment on itemize line
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -120,8 +119,6 @@
   ],
   'type' => 'text_root'
 };
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'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];
@@ -132,6 +129,8 @@
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[1];
 $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_first_on_itemize_line'};
 

Modified: trunk/tp/t/results/itemize/enumerate_argument.pl
===================================================================
--- trunk/tp/t/results/itemize/enumerate_argument.pl    2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/itemize/enumerate_argument.pl    2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -91,24 +91,6 @@
             {
               'parent' => {},
               'text' => 'A'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -156,6 +138,24 @@
             {}
           ]
         ],
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'enumerate_specification' => 'A',
         'spaces_before_argument' => ' '
@@ -185,24 +185,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'space_at_end_block_command'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -250,6 +232,24 @@
             {}
           ]
         ],
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'enumerate_specification' => 'z',
         'spaces_before_argument' => ' '
@@ -276,8 +276,6 @@
 $result_trees{'enumerate_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_argument'};
 $result_trees{'enumerate_argument'}{'contents'}[1]{'parent'} = 
$result_trees{'enumerate_argument'};
 
$result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0];
-$result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'enumerate_argument'}{'contents'}[2];
 
$result_trees{'enumerate_argument'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[2]{'contents'}[0]{'args'}[0];
@@ -284,13 +282,13 @@
 
$result_trees{'enumerate_argument'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[2]{'contents'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_argument'}{'contents'}[2];
 
$result_trees{'enumerate_argument'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
 = $result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'enumerate_argument'}{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[2]{'extra'}{'end_command'} = 
$result_trees{'enumerate_argument'}{'contents'}[2]{'contents'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[2]{'parent'} = 
$result_trees{'enumerate_argument'};
 $result_trees{'enumerate_argument'}{'contents'}[3]{'parent'} = 
$result_trees{'enumerate_argument'};
 
$result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0];
-$result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'enumerate_argument'}{'contents'}[4];
 
$result_trees{'enumerate_argument'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[4]{'contents'}[0]{'args'}[0];
@@ -297,6 +295,8 @@
 
$result_trees{'enumerate_argument'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[4]{'contents'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_argument'}{'contents'}[4];
 
$result_trees{'enumerate_argument'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
 = $result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'enumerate_argument'}{'contents'}[4]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[4]{'extra'}{'comment_at_end'};
+$result_trees{'enumerate_argument'}{'contents'}[4]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[4]{'extra'}{'end_command'} = 
$result_trees{'enumerate_argument'}{'contents'}[4]{'contents'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[4]{'parent'} = 
$result_trees{'enumerate_argument'};
 

Modified: trunk/tp/t/results/itemize/enumerate_argument_item.pl
===================================================================
--- trunk/tp/t/results/itemize/enumerate_argument_item.pl       2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/itemize/enumerate_argument_item.pl       2018-09-11 
20:49:04 UTC (rev 8162)
@@ -143,24 +143,6 @@
             {
               'parent' => {},
               'text' => 'A'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -260,6 +242,24 @@
             {}
           ]
         ],
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'enumerate_specification' => 'A',
         'spaces_before_argument' => ' '
@@ -289,24 +289,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'space_at_end_block_command'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -406,6 +388,24 @@
             {}
           ]
         ],
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'enumerate_specification' => 'z',
         'spaces_before_argument' => ' '
@@ -438,8 +438,6 @@
 $result_trees{'enumerate_argument_item'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_argument_item'};
 $result_trees{'enumerate_argument_item'}{'contents'}[1]{'parent'} = 
$result_trees{'enumerate_argument_item'};
 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0];
-$result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0];
 $result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'enumerate_argument_item'}{'contents'}[2];
 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[2]{'contents'}[0];
@@ -452,13 +450,13 @@
 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[2]{'contents'}[2];
 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[2];
 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'enumerate_argument_item'}{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'enumerate_argument_item'}{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'extra'}{'end_command'} 
= $result_trees{'enumerate_argument_item'}{'contents'}[2]{'contents'}[2];
 $result_trees{'enumerate_argument_item'}{'contents'}[2]{'parent'} = 
$result_trees{'enumerate_argument_item'};
 $result_trees{'enumerate_argument_item'}{'contents'}[3]{'parent'} = 
$result_trees{'enumerate_argument_item'};
 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0];
-$result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0];
 $result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'enumerate_argument_item'}{'contents'}[4];
 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[4]{'contents'}[0];
@@ -471,6 +469,8 @@
 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[4];
 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'enumerate_argument_item'}{'contents'}[4]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'extra'}{'comment_at_end'};
+$result_trees{'enumerate_argument_item'}{'contents'}[4]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'extra'}{'end_command'} 
= $result_trees{'enumerate_argument_item'}{'contents'}[4]{'contents'}[2];
 $result_trees{'enumerate_argument_item'}{'contents'}[4]{'parent'} = 
$result_trees{'enumerate_argument_item'};
 

Modified: trunk/tp/t/results/menu/comment_on_menu_line.pl
===================================================================
--- trunk/tp/t/results/menu/comment_on_menu_line.pl     2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/menu/comment_on_menu_line.pl     2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -42,26 +42,7 @@
         {
           'args' => [
             {
-              'contents' => [
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => '
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  },
-                  'parent' => {}
-                }
-              ],
+              'contents' => [],
               'parent' => {},
               'type' => 'block_line_arg'
             }
@@ -159,6 +140,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  '
+'
+                ]
+              },
+              'parent' => {}
+            },
             'end_command' => {},
             'spaces_before_argument' => '  '
           },
@@ -281,8 +280,6 @@
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0];
 $result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'comment_on_menu_line'}{'contents'}[1];
 $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'comment_on_menu_line'}{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
@@ -298,6 +295,8 @@
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'comment_on_menu_line'}{'contents'}[1];
 $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'comment_on_menu_line'}{'contents'}[1];
@@ -384,6 +383,15 @@
     {
       'cmdname' => 'menu',
       'extra' => {
+        'comment_at_end' => {
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              '
+'
+            ]
+          }
+        },
         'end_command' => {
           'cmdname' => 'end',
           'extra' => {

Modified: trunk/tp/t/results/misc_commands/bad_documentlanguage.pl
===================================================================
--- trunk/tp/t/results/misc_commands/bad_documentlanguage.pl    2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/misc_commands/bad_documentlanguage.pl    2018-09-11 
20:49:04 UTC (rev 8162)
@@ -66,14 +66,9 @@
           'contents' => [
             {
               'parent' => {},
-              'text' => 'en'
+              'text' => 'en '
             },
             {
-              'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
-            },
-            {
               'args' => [
                 {
                   'contents' => [
@@ -167,13 +162,12 @@
 $result_trees{'bad_documentlanguage'}{'contents'}[1]{'parent'} = 
$result_trees{'bad_documentlanguage'};
 $result_trees{'bad_documentlanguage'}{'contents'}[2]{'parent'} = 
$result_trees{'bad_documentlanguage'};
 
$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0];
+$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0];
-$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0];
 $result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'bad_documentlanguage'}{'contents'}[3];
-$result_trees{'bad_documentlanguage'}{'contents'}[3]{'line_nr'} = 
$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'bad_documentlanguage'}{'contents'}[3]{'line_nr'} = 
$result_trees{'bad_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'bad_documentlanguage'}{'contents'}[3]{'parent'} = 
$result_trees{'bad_documentlanguage'};
 $result_trees{'bad_documentlanguage'}{'contents'}[4]{'parent'} = 
$result_trees{'bad_documentlanguage'};
 
$result_trees{'bad_documentlanguage'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'bad_documentlanguage'}{'contents'}[5]{'args'}[0];

Modified: trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
--- trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl   
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl   
2018-09-11 20:49:04 UTC (rev 8162)
@@ -20,24 +20,6 @@
                 {
                   'cmdname' => ' ',
                   'parent' => {}
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' settittle
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' settittle
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -46,6 +28,24 @@
           ],
           'cmdname' => 'settitle',
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' settittle
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' settittle
+'
+                ]
+              },
+              'parent' => {}
+            },
             'misc_content' => [
               {},
               {}
@@ -81,24 +81,6 @@
               'parent' => {},
               'text' => '  ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' @node Top
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' @node Top
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -108,6 +90,24 @@
       'cmdname' => 'node',
       'contents' => [],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' @node Top
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'comment',
+          'extra' => {
+            'misc_args' => [
+              ' @node Top
+'
+            ]
+          },
+          'parent' => {}
+        },
         'node_content' => [
           {}
         ],
@@ -143,24 +143,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' @top
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' @top
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -187,24 +169,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comment frenchspacing
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment frenchspacing
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -213,6 +177,24 @@
           ],
           'cmdname' => 'frenchspacing',
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment frenchspacing
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment frenchspacing
+'
+                ]
+              },
+              'parent' => {}
+            },
             'misc_args' => [
               'on'
             ],
@@ -247,24 +229,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' index entry
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' index entry
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -273,6 +237,24 @@
           ],
           'cmdname' => 'cindex',
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' index entry
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' index entry
+'
+                ]
+              },
+              'parent' => {}
+            },
             'index_entry' => {
               'command' => {},
               'content' => [
@@ -321,24 +303,6 @@
                   'parent' => {},
                   'text' => '    ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' heading
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' heading
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -347,6 +311,24 @@
           ],
           'cmdname' => 'heading',
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' heading
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' heading
+'
+                ]
+              },
+              'parent' => {}
+            },
             'misc_content' => [
               {},
               {}
@@ -379,24 +361,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' printindex 
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' printindex 
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -405,6 +369,24 @@
           ],
           'cmdname' => 'printindex',
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' printindex 
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' printindex 
+'
+                ]
+              },
+              'parent' => {}
+            },
             'misc_args' => [
               'cp'
             ],
@@ -480,24 +462,6 @@
                       'parent' => {},
                       'text' => ' ',
                       'type' => 'spaces_at_end'
-                    },
-                    {
-                      'args' => [
-                        {
-                          'parent' => {},
-                          'text' => ' end
-',
-                          'type' => 'misc_arg'
-                        }
-                      ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' end
-'
-                        ]
-                      },
-                      'parent' => {}
                     }
                   ],
                   'parent' => {},
@@ -507,6 +471,24 @@
               'cmdname' => 'end',
               'extra' => {
                 'command_argument' => 'float',
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' end
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' end
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -566,24 +548,6 @@
                 {
                   'cmdname' => ' ',
                   'parent' => {}
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' listoffloats
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' listoffloats
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -592,6 +556,24 @@
           ],
           'cmdname' => 'listoffloats',
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' listoffloats
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' listoffloats
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -616,6 +598,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' @top
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'comment',
+          'extra' => {
+            'misc_args' => [
+              ' @top
+'
+            ]
+          },
+          'parent' => {}
+        },
         'misc_content' => [
           {},
           {}
@@ -647,9 +647,9 @@
 };
 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0];
+$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[0];
@@ -657,9 +657,9 @@
 $result_trees{'comment_space_command_on_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_space_command_on_line'};
 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[1];
+$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'extra'}{'node_content'};
 $result_trees{'comment_space_command_on_line'}{'contents'}[1]{'parent'} = 
$result_trees{'comment_space_command_on_line'};
@@ -666,23 +666,21 @@
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1];
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3];
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[1]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1];
@@ -694,9 +692,9 @@
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[3];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5];
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'extra'}{'misc_content'}[1]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[1];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
@@ -703,9 +701,9 @@
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7];
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[8]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[0];
@@ -717,9 +715,9 @@
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'block_command_line_contents'}[1][0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'args'}[1]{'contents'}[0];
@@ -731,13 +729,15 @@
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[2];
-$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11];
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'extra'}{'type'}{'content'}[1]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[1];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[12]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'extra'}{'misc_content'}[1]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'contents'}[1];
 $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'parent'} = 
$result_trees{'comment_space_command_on_line'};
@@ -792,10 +792,28 @@
         'associated_node' => {
           'cmdname' => 'node',
           'extra' => {
+            'comment_at_end' => {
+              'cmdname' => 'comment',
+              'extra' => {
+                'misc_args' => [
+                  ' @node Top
+'
+                ]
+              }
+            },
             'normalized' => 'Top',
             'spaces_before_argument' => ' '
           }
         },
+        'comment_at_end' => {
+          'cmdname' => 'comment',
+          'extra' => {
+            'misc_args' => [
+              ' @top
+'
+            ]
+          }
+        },
         'spaces_before_argument' => ' '
       },
       'level' => 0,
@@ -811,10 +829,28 @@
     'associated_section' => {
       'cmdname' => 'top',
       'extra' => {
+        'comment_at_end' => {
+          'cmdname' => 'comment',
+          'extra' => {
+            'misc_args' => [
+              ' @top
+'
+            ]
+          }
+        },
         'spaces_before_argument' => ' '
       },
       'level' => 0
     },
+    'comment_at_end' => {
+      'cmdname' => 'comment',
+      'extra' => {
+        'misc_args' => [
+          ' @node Top
+'
+        ]
+      }
+    },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
@@ -835,6 +871,15 @@
 $result_menus{'comment_space_command_on_line'} = {
   'cmdname' => 'node',
   'extra' => {
+    'comment_at_end' => {
+      'cmdname' => 'comment',
+      'extra' => {
+        'misc_args' => [
+          ' @node Top
+'
+        ]
+      }
+    },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   }
@@ -852,6 +897,15 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'float',
+            'comment_at_end' => {
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' end
+'
+                ]
+              }
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'float'
           }
@@ -859,6 +913,15 @@
         'float_section' => {
           'cmdname' => 'top',
           'extra' => {
+            'comment_at_end' => {
+              'cmdname' => 'comment',
+              'extra' => {
+                'misc_args' => [
+                  ' @top
+'
+                ]
+              }
+            },
             'spaces_before_argument' => ' '
           },
           'level' => 0

Modified: trunk/tp/t/results/misc_commands/setfilename.pl
===================================================================
--- trunk/tp/t/results/misc_commands/setfilename.pl     2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/misc_commands/setfilename.pl     2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -14,24 +14,6 @@
             {
               'parent' => {},
               'text' => 'file_comment'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -40,6 +22,24 @@
       ],
       'cmdname' => 'setfilename',
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'spaces_before_argument' => ' ',
         'text_arg' => 'file_comment'
       },
@@ -93,24 +93,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -119,6 +101,24 @@
       ],
       'cmdname' => 'setfilename',
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'spaces_before_argument' => ' ',
         'text_arg' => 'file_space_comment'
       },
@@ -197,9 +197,9 @@
   'type' => 'text_root'
 };
 
$result_trees{'setfilename'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'setfilename'}{'contents'}[0]{'args'}[0];
-$result_trees{'setfilename'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'setfilename'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'setfilename'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'setfilename'}{'contents'}[0]{'args'}[0];
 $result_trees{'setfilename'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'setfilename'}{'contents'}[0];
+$result_trees{'setfilename'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'setfilename'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'setfilename'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'setfilename'}{'contents'}[0]{'args'}[0];
 $result_trees{'setfilename'}{'contents'}[0]{'parent'} = 
$result_trees{'setfilename'};
 
$result_trees{'setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'setfilename'}{'contents'}[1]{'args'}[0];
 
$result_trees{'setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'setfilename'}{'contents'}[1]{'args'}[0];
@@ -207,9 +207,9 @@
 $result_trees{'setfilename'}{'contents'}[1]{'parent'} = 
$result_trees{'setfilename'};
 
$result_trees{'setfilename'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'setfilename'}{'contents'}[2]{'args'}[0];
 
$result_trees{'setfilename'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'setfilename'}{'contents'}[2]{'args'}[0];
-$result_trees{'setfilename'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'setfilename'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'setfilename'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'setfilename'}{'contents'}[2]{'args'}[0];
 $result_trees{'setfilename'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'setfilename'}{'contents'}[2];
+$result_trees{'setfilename'}{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'setfilename'}{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'setfilename'}{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'setfilename'}{'contents'}[2]{'args'}[0];
 $result_trees{'setfilename'}{'contents'}[2]{'parent'} = 
$result_trees{'setfilename'};
 
$result_trees{'setfilename'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'setfilename'}{'contents'}[3]{'args'}[0];
 
$result_trees{'setfilename'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setfilename'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0];

Modified: trunk/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
===================================================================
--- trunk/tp/t/results/multitable/prototype_brace_no_brace_comment.pl   
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/multitable/prototype_brace_no_brace_comment.pl   
2018-09-11 20:49:04 UTC (rev 8162)
@@ -24,24 +24,6 @@
             {
               'parent' => {},
               'text' => ' bb'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' cc
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' cc
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -84,6 +66,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' cc
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'comment',
+          'extra' => {
+            'misc_args' => [
+              ' cc
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'max_columns' => 2,
         'prototypes' => [
@@ -122,13 +122,13 @@
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0];
-$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0];
+$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'};
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];

Modified: trunk/tp/t/results/quotation/comment_on_quotation_line.pl
===================================================================
--- trunk/tp/t/results/quotation/comment_on_quotation_line.pl   2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/quotation/comment_on_quotation_line.pl   2018-09-11 
20:49:04 UTC (rev 8162)
@@ -18,24 +18,6 @@
             {
               'cmdname' => ' ',
               'parent' => {}
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' quotation 
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' quotation 
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -95,6 +77,24 @@
             {}
           ]
         ],
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' quotation 
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' quotation 
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -110,8 +110,6 @@
 };
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0];
-$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0];
 $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'comment_on_quotation_line'}{'contents'}[0];
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0];
@@ -121,6 +119,8 @@
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0];
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][1]
 = 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[1];
 $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_on_quotation_line'};
 

Modified: trunk/tp/t/results/quotation/only_comment_on_quotation_line.pl
===================================================================
--- trunk/tp/t/results/quotation/only_comment_on_quotation_line.pl      
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/quotation/only_comment_on_quotation_line.pl      
2018-09-11 20:49:04 UTC (rev 8162)
@@ -10,26 +10,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -81,6 +62,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -94,8 +93,6 @@
   ],
   'type' => 'text_root'
 };
-$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'only_comment_on_quotation_line'}{'contents'}[0];
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'only_comment_on_quotation_line'}{'contents'}[0];
@@ -103,6 +100,8 @@
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'only_comment_on_quotation_line'}{'contents'}[0];
+$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[1];
 $result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'parent'} = 
$result_trees{'only_comment_on_quotation_line'};
 

Modified: trunk/tp/t/results/raw/misc_raw_comments.pl
===================================================================
--- trunk/tp/t/results/raw/misc_raw_comments.pl 2018-09-09 16:03:26 UTC (rev 
8161)
+++ trunk/tp/t/results/raw/misc_raw_comments.pl 2018-09-11 20:49:04 UTC (rev 
8162)
@@ -16,26 +16,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment space
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment space
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -59,24 +40,6 @@
                 {
                   'parent' => {},
                   'text' => 'html'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comment no space
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment no space
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -86,6 +49,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'html',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment no space
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment no space
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'html'
           },
@@ -98,6 +79,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment space
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment space
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -147,24 +146,6 @@
                   'parent' => {},
                   'text' => '    ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comment after end tex
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment after end tex
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -174,6 +155,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'tex',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment after end tex
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment after end tex
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'tex'
           },
@@ -252,16 +251,16 @@
   'type' => 'text_root'
 };
 $result_trees{'misc_raw_comments'}{'contents'}[0]{'parent'} = 
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[1];
 
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[1];
 
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[1]{'extra'}{'end_command'} = 
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1];
 $result_trees{'misc_raw_comments'}{'contents'}[1]{'parent'} = 
$result_trees{'misc_raw_comments'};
 $result_trees{'misc_raw_comments'}{'contents'}[2]{'parent'} = 
$result_trees{'misc_raw_comments'};
@@ -270,9 +269,9 @@
 $result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[3];
 
$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[3];
 
$result_trees{'misc_raw_comments'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
 = $result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[3]{'extra'}{'end_command'} = 
$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0];

Modified: trunk/tp/t/results/sectioning/empty_nodes_with_commands.pl
===================================================================
--- trunk/tp/t/results/sectioning/empty_nodes_with_commands.pl  2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/sectioning/empty_nodes_with_commands.pl  2018-09-11 
20:49:04 UTC (rev 8162)
@@ -22,26 +22,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'misc_line_arg'
         }
@@ -56,6 +37,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'nodes_manuals' => [
           undef
         ],
@@ -199,10 +198,10 @@
 };
 
$result_trees{'empty_nodes_with_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_nodes_with_commands'}{'contents'}[0];
 $result_trees{'empty_nodes_with_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_nodes_with_commands'};
-$result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'args'}[0];
 $result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'empty_nodes_with_commands'}{'contents'}[1];
 
$result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_nodes_with_commands'}{'contents'}[1];
+$result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'args'}[0];
 $result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_nodes_with_commands'};
 
$result_trees{'empty_nodes_with_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_nodes_with_commands'}{'contents'}[2]{'args'}[0];
 $result_trees{'empty_nodes_with_commands'}{'contents'}[2]{'args'}[0]{'parent'} 
= $result_trees{'empty_nodes_with_commands'}{'contents'}[2];

Modified: trunk/tp/t/results/sectioning/empty_ref_arg.pl
===================================================================
--- trunk/tp/t/results/sectioning/empty_ref_arg.pl      2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/sectioning/empty_ref_arg.pl      2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -248,33 +248,11 @@
                     {
                       'cmdname' => ' ',
                       'parent' => {}
-                    },
-                    {
-                      'parent' => {},
-                      'text' => '
-',
-                      'type' => 'spaces_at_end'
-                    },
-                    {
-                      'args' => [
-                        {
-                          'parent' => {},
-                          'text' => ' ggg
-',
-                          'type' => 'misc_arg'
-                        }
-                      ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' ggg
-'
-                        ]
-                      },
-                      'parent' => {}
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => '
+',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -299,24 +277,6 @@
                         ]
                       },
                       'parent' => {}
-                    },
-                    {
-                      'args' => [
-                        {
-                          'parent' => {},
-                          'text' => '
-',
-                          'type' => 'misc_arg'
-                        }
-                      ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          '
-'
-                        ]
-                      },
-                      'parent' => {}
                     }
                   ],
                   'extra' => {
@@ -329,6 +289,24 @@
               'cmdname' => 'ref',
               'contents' => [],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      '
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'label' => {},
                 'node_argument' => {
                   'node_content' => [
@@ -415,15 +393,12 @@
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'}
 = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[0];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[1];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'parent'}
 = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
+$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'extra'}{'comment_at_end'};
+$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'extra'}{'label'}
 = $result_trees{'empty_ref_arg'}{'contents'}[1];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1];
@@ -440,10 +415,9 @@
 @ref{Top, @ , @:}
 @ref{Top, @c aaa
  @ 
address@hidden ggg
 , @c fff
address@hidden
-}
address@hidden
+
 ';
 
 
@@ -523,22 +497,17 @@
   },
   {
     'error_line' => ':11: warning: in @ref empty cross reference name after 
expansion address@hidden aaa
- @ 
address@hidden ggg
-\'
+ @ \'
 ',
     'file_name' => '',
     'line_nr' => 11,
     'macro' => '',
     'text' => 'in @ref empty cross reference name after expansion 
address@hidden aaa
- @ 
address@hidden ggg
-\'',
+ @ \'',
     'type' => 'warning'
   },
   {
     'error_line' => ':11: warning: in @ref empty cross reference title after 
expansion address@hidden fff
address@hidden
 \'
 ',
     'file_name' => '',
@@ -545,7 +514,6 @@
     'line_nr' => 11,
     'macro' => '',
     'text' => 'in @ref empty cross reference title after expansion 
address@hidden fff
address@hidden
 \'',
     'type' => 'warning'
   }

Modified: trunk/tp/t/results/sectioning/node.pl
===================================================================
--- trunk/tp/t/results/sectioning/node.pl       2018-09-09 16:03:26 UTC (rev 
8161)
+++ trunk/tp/t/results/sectioning/node.pl       2018-09-11 20:49:04 UTC (rev 
8162)
@@ -414,24 +414,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => '
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  '
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -448,6 +430,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'comment',
+          'extra' => {
+            'misc_args' => [
+              '
+'
+            ]
+          },
+          'parent' => {}
+        },
         'node_content' => [
           {}
         ],
@@ -555,24 +555,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comma , end
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comma , end
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'extra' => {
@@ -585,6 +567,24 @@
       'cmdname' => 'node',
       'contents' => [],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comma , end
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comma , end
+'
+            ]
+          },
+          'parent' => {}
+        },
         'node_content' => [
           {},
           {},
@@ -680,10 +680,10 @@
 $result_trees{'node'}{'contents'}[5]{'parent'} = $result_trees{'node'};
 $result_trees{'node'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'node'}{'contents'}[6]{'args'}[0];
 $result_trees{'node'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'node'}{'contents'}[6]{'args'}[0];
-$result_trees{'node'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'node'}{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'node'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'node'}{'contents'}[6]{'args'}[0];
 $result_trees{'node'}{'contents'}[6]{'args'}[0]{'parent'} = 
$result_trees{'node'}{'contents'}[6];
 $result_trees{'node'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'node'}{'contents'}[6];
+$result_trees{'node'}{'contents'}[6]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'node'}{'contents'}[6]{'extra'}{'comment_at_end'};
+$result_trees{'node'}{'contents'}[6]{'extra'}{'comment_at_end'}{'parent'} = 
$result_trees{'node'}{'contents'}[6]{'args'}[0];
 $result_trees{'node'}{'contents'}[6]{'extra'}{'node_content'}[0] = 
$result_trees{'node'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'node'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = $result_trees{'node'}{'contents'}[6]{'extra'}{'node_content'};
 $result_trees{'node'}{'contents'}[6]{'parent'} = $result_trees{'node'};
@@ -703,9 +703,9 @@
 $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[0]{'line_nr'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[2];
 $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[2];
-$result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[2];
-$result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[2];
 $result_trees{'node'}{'contents'}[7]{'args'}[2]{'parent'} = 
$result_trees{'node'}{'contents'}[7];
+$result_trees{'node'}{'contents'}[7]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'node'}{'contents'}[7]{'extra'}{'comment_at_end'};
+$result_trees{'node'}{'contents'}[7]{'extra'}{'comment_at_end'}{'parent'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[2];
 $result_trees{'node'}{'contents'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 $result_trees{'node'}{'contents'}[7]{'extra'}{'node_content'}[1] = 
$result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[1];
 $result_trees{'node'}{'contents'}[7]{'extra'}{'node_content'}[2] = 
$result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[2];

Modified: trunk/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
===================================================================
--- trunk/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl  
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl  
2018-09-11 20:49:04 UTC (rev 8162)
@@ -59,14 +59,9 @@
           'contents' => [
             {
               'parent' => {},
-              'text' => 'In top'
+              'text' => 'In top '
             },
             {
-              'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
-            },
-            {
               'args' => [
                 {
                   'contents' => [
@@ -146,7 +141,6 @@
       'extra' => {
         'misc_content' => [
           {},
-          {},
           {}
         ],
         'spaces_before_argument' => ' '
@@ -166,11 +160,10 @@
 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[1]{'extra'}{'node_content'};
 $result_trees{'setfilename_on_top_and_after_node'}{'contents'}[1]{'parent'} = 
$result_trees{'setfilename_on_top_and_after_node'};
 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0];
+$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0];
-$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0];
 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2];
 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2];
 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'contents'}[1]{'args'}[0];
@@ -179,8 +172,7 @@
 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2];
 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'extra'}{'misc_content'}[1]
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'extra'}{'misc_content'}[2]
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'line_nr'} = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'line_nr'} = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'setfilename_on_top_and_after_node'}{'contents'}[2]{'parent'} = 
$result_trees{'setfilename_on_top_and_after_node'};
 
 $result_texis{'setfilename_on_top_and_after_node'} = '@node Top
@@ -190,8 +182,8 @@
 ';
 
 
-$result_texts{'setfilename_on_top_and_after_node'} = 'In top
-******
+$result_texts{'setfilename_on_top_and_after_node'} = 'In top 
+*******
 
 ';
 
@@ -302,8 +294,8 @@
 
 
 
-$result_converted{'plaintext'}->{'setfilename_on_top_and_after_node'} = 'In top
-******
+$result_converted{'plaintext'}->{'setfilename_on_top_and_after_node'} = 'In 
top 
+*******
 
 ';
 
@@ -313,10 +305,10 @@
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>In top</title>
+<title>In top </title>
 
-<meta name="description" content="In top">
-<meta name="keywords" content="In top">
+<meta name="description" content="In top ">
+<meta name="keywords" content="In top ">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <link href="#Top" rel="start" title="Top">
@@ -353,8 +345,8 @@
 
 <body lang="en">
 <a name="Top"></a>
-<a name="In-top"></a>
-<h1 class="top">In top</h1>
+<a name="In-top-"></a>
+<h1 class="top">In top </h1>
 
 <hr>
 

Modified: trunk/tp/t/results/value/set_in_item_missing_line.pl
===================================================================
--- trunk/tp/t/results/value/set_in_item_missing_line.pl        2018-09-09 
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/value/set_in_item_missing_line.pl        2018-09-11 
20:49:04 UTC (rev 8162)
@@ -45,14 +45,9 @@
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'xx'
+                          'text' => 'xx '
                         },
                         {
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces_at_end'
-                        },
-                        {
                           'args' => [
                             {
                               'parent' => {},
@@ -85,7 +80,6 @@
                   'extra' => {
                     'misc_content' => [
                       {},
-                      {},
                       {}
                     ],
                     'spaces_before_argument' => ' '
@@ -364,14 +358,12 @@
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'args'}[0];
 $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'set_in_item_missing_line'}{'contents'}[0];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'set_in_item_missing_line'}{'contents'}[0];
@@ -432,7 +424,7 @@
 ';
 
 
-$result_texts{'set_in_item_missing_line'} = 'xx
+$result_texts{'set_in_item_missing_line'} = 'xx 
 jj
 
 xx jj

Modified: trunk/tp/t/results/value/set_on_item_line.pl
===================================================================
--- trunk/tp/t/results/value/set_on_item_line.pl        2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/value/set_on_item_line.pl        2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -428,14 +428,9 @@
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'jj'
+                          'text' => 'jj '
                         },
                         {
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces_at_end'
-                        },
-                        {
                           'args' => [
                             {
                               'parent' => {},
@@ -468,7 +463,6 @@
                   'extra' => {
                     'misc_content' => [
                       {},
-                      {},
                       {}
                     ],
                     'spaces_before_argument' => ' '
@@ -515,14 +509,9 @@
                       'contents' => [
                         {
                           'parent' => {},
-                          'text' => 'vvv'
+                          'text' => 'vvv '
                         },
                         {
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces_at_end'
-                        },
-                        {
                           'args' => [
                             {
                               'parent' => {},
@@ -555,7 +544,6 @@
                   'extra' => {
                     'misc_content' => [
                       {},
-                      {},
                       {}
                     ],
                     'spaces_before_argument' => ' '
@@ -688,14 +676,12 @@
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0];
 $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'set_on_item_line'}{'contents'}[2];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -703,14 +689,12 @@
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1];
 $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'set_on_item_line'}{'contents'}[2];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0];
 
$result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2];
 $result_trees{'set_on_item_line'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'set_on_item_line'}{'contents'}[2];
@@ -752,9 +736,9 @@
 
 item text
 in item
-jj
+jj 
 line
-vvv
+vvv 
 ';
 
 $result_errors{'set_on_item_line'} = [];

Modified: trunk/tp/t/results/xml_tests/comments_end_lines.pl
===================================================================
--- trunk/tp/t/results/xml_tests/comments_end_lines.pl  2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/xml_tests/comments_end_lines.pl  2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -57,24 +57,6 @@
                   'parent' => {},
                   'text' => '  ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comment itemize
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comment itemize
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -84,6 +66,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'itemize',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment itemize
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment itemize
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'itemize'
           },
@@ -147,24 +147,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comm
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -174,6 +156,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'enumerate',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'enumerate'
           },
@@ -288,24 +288,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' table
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' table
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -315,6 +297,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'table',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' table
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' table
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'table'
           },
@@ -380,24 +380,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' quot no arg
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' quot no arg
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -407,6 +389,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'quotation',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' quot no arg
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' quot no arg
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'quotation'
           },
@@ -470,24 +470,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comm
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -497,6 +479,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'group',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'group'
           },
@@ -560,24 +560,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comm
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -587,6 +569,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'example',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'example'
           },
@@ -734,24 +734,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comm
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -761,6 +743,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'multitable',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'multitable'
           },
@@ -841,24 +841,6 @@
                   'parent' => {},
                   'text' => '  ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comm
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -868,6 +850,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'float',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'float'
           },
@@ -950,24 +950,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comm
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -977,6 +959,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'flushright',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'flushright'
           },
@@ -1040,24 +1040,6 @@
                   'parent' => {},
                   'text' => ' ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' comm
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' comm
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -1067,6 +1049,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'raggedright',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'raggedright'
           },
@@ -1099,9 +1099,9 @@
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
@@ -1113,9 +1113,9 @@
 $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[2];
 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[2];
 $result_trees{'comments_end_lines'}{'contents'}[2]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[2]{'extra'}{'spaces_after_command_elt'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[0];
@@ -1133,9 +1133,9 @@
 $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[4];
 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[4];
 
$result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'command_as_argument'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -1149,9 +1149,9 @@
 $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[6];
 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[6];
 $result_trees{'comments_end_lines'}{'contents'}[6]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2];
 
$result_trees{'comments_end_lines'}{'contents'}[6]{'extra'}{'spaces_after_command_elt'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[0];
@@ -1163,9 +1163,9 @@
 $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[8];
 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[8];
 $result_trees{'comments_end_lines'}{'contents'}[8]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2];
 
$result_trees{'comments_end_lines'}{'contents'}[8]{'extra'}{'spaces_after_command_elt'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[0];
@@ -1177,9 +1177,9 @@
 $result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[10];
 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[10];
 $result_trees{'comments_end_lines'}{'contents'}[10]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2];
 
$result_trees{'comments_end_lines'}{'contents'}[10]{'extra'}{'spaces_after_command_elt'}
 = $result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[0];
@@ -1201,9 +1201,9 @@
 $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[12];
 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[12];
 
$result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'columnfractions'} 
= 
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'extra'}{'misc_args'};
 $result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1];
@@ -1219,9 +1219,9 @@
 $result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[14];
 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[14];
 
$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'block_command_line_contents'}[1][0]
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[1]{'contents'}[0];
@@ -1236,9 +1236,9 @@
 $result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[16];
 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[16];
 $result_trees{'comments_end_lines'}{'contents'}[16]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2];
 
$result_trees{'comments_end_lines'}{'contents'}[16]{'extra'}{'spaces_after_command_elt'}
 = $result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[0];
@@ -1250,9 +1250,9 @@
 $result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[18];
 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[18];
 $result_trees{'comments_end_lines'}{'contents'}[18]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2];
 
$result_trees{'comments_end_lines'}{'contents'}[18]{'extra'}{'spaces_after_command_elt'}
 = $result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[0];
@@ -1332,6 +1332,15 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'float',
+            'comment_at_end' => {
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              }
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'float'
           }

Modified: trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
--- trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl     
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl     
2018-09-11 20:49:04 UTC (rev 8162)
@@ -10,26 +10,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -107,6 +88,24 @@
           ]
         ],
         'command_as_argument' => {},
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -135,24 +134,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'space_at_end_block_command'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -226,6 +207,24 @@
             {}
           ]
         ],
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -261,24 +260,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'space_at_end_block_command'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -353,6 +334,24 @@
           ]
         ],
         'command_as_argument' => {},
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -391,24 +390,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'space_at_end_block_command'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -483,6 +464,24 @@
           ]
         ],
         'command_as_argument' => {},
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -498,26 +497,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -584,6 +564,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'enumerate_specification' => 1,
         'spaces_before_argument' => ' '
@@ -613,24 +611,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'space_at_end_block_command'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -704,6 +684,24 @@
             {}
           ]
         ],
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'enumerate_specification' => 'a',
         'spaces_before_argument' => ' '
@@ -740,24 +738,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'space_at_end_block_command'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' table
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' table
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -851,6 +831,24 @@
           ]
         ],
         'command_as_argument' => {},
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' table
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' table
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -866,26 +864,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' quot no arg
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' quot no arg
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -937,6 +916,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' quot no arg
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' quot no arg
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -965,24 +962,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'space_at_end_block_command'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' quot arg
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' quot arg
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -1041,6 +1020,24 @@
             {}
           ]
         ],
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' quot arg
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' quot arg
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -1060,26 +1057,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -1131,6 +1109,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -1150,26 +1146,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -1221,6 +1198,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -1253,24 +1248,6 @@
                       'parent' => {},
                       'text' => ' ',
                       'type' => 'spaces_at_end'
-                    },
-                    {
-                      'args' => [
-                        {
-                          'parent' => {},
-                          'text' => ' comm
-',
-                          'type' => 'misc_arg'
-                        }
-                      ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comm
-'
-                        ]
-                      },
-                      'parent' => {}
                     }
                   ],
                   'parent' => {},
@@ -1279,6 +1256,24 @@
               ],
               'cmdname' => 'columnfractions',
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comm
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'misc_args' => [
                   '0.4',
                   '0.6'
@@ -1441,24 +1436,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' c
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' c
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -1563,6 +1540,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' c
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' c
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'max_columns' => 2,
         'prototypes' => [
@@ -1624,24 +1619,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'space_at_end_block_command'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -1703,6 +1680,24 @@
             {}
           ]
         ],
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'node_content' => [
           {}
@@ -1733,26 +1728,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -1804,6 +1780,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -1823,26 +1817,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comm
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comm
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -1894,6 +1869,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comm
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -1913,8 +1906,6 @@
   ],
   'type' => 'text_root'
 };
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'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];
@@ -1925,13 +1916,13 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[1]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[2];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'contents'}[0];
@@ -1941,13 +1932,13 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[2];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[3]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[4];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[0];
@@ -1958,6 +1949,8 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[4];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'line_nr'} = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
@@ -1965,8 +1958,6 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[6];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[0];
@@ -1977,12 +1968,12 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[6];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'line_nr'} = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[7]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[8];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[0];
@@ -1991,13 +1982,13 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[8];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[9]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[10];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'contents'}[0];
@@ -2007,13 +1998,13 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[10];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[11]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[12];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -2028,12 +2019,12 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[12];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'line_nr'} = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[13]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[14];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[14];
@@ -2041,13 +2032,13 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[14];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[15]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
@@ -2056,11 +2047,11 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[17]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[18];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[18];
@@ -2068,11 +2059,11 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[18];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[19]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[20];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[20];
@@ -2080,14 +2071,16 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[20];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[21]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[22];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -2114,8 +2107,6 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[2];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[4];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[24];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -2130,6 +2121,8 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[24];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes'}[0]{'contents'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[0]{'contents'};
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes'}[1]{'contents'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[2]{'contents'};
@@ -2141,8 +2134,6 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
@@ -2152,13 +2143,13 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'block_command_line_contents'}[1][0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'}[0];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[27]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
@@ -2166,11 +2157,11 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[29]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[30];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[30];
@@ -2178,6 +2169,8 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[30];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 $result_trees{'comments_on_block_command_lines'}{'contents'}[31]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
@@ -2293,6 +2286,15 @@
     {
       'cmdname' => 'float',
       'extra' => {
+        'comment_at_end' => {
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comm
+'
+            ]
+          }
+        },
         'end_command' => {
           'cmdname' => 'end',
           'extra' => {

Modified: trunk/tp/t/results/xml_tests/comments_on_misc_command_line.pl
===================================================================
--- trunk/tp/t/results/xml_tests/comments_on_misc_command_line.pl       
2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/xml_tests/comments_on_misc_command_line.pl       
2018-09-11 20:49:04 UTC (rev 8162)
@@ -19,24 +19,6 @@
               'parent' => {},
               'text' => '  ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' setfilename (text)
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' setfilename (text)
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -45,6 +27,24 @@
       ],
       'cmdname' => 'setfilename',
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' setfilename (text)
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' setfilename (text)
+'
+            ]
+          },
+          'parent' => {}
+        },
         'spaces_before_argument' => '  ',
         'text_arg' => 'comments_on_misc_command_line.info'
       },
@@ -67,24 +67,6 @@
               'parent' => {},
               'text' => '  ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' definfoenclose (number)
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' definfoenclose (number)
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -93,6 +75,24 @@
       ],
       'cmdname' => 'definfoenclose',
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' definfoenclose (number)
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' definfoenclose (number)
+'
+            ]
+          },
+          'parent' => {}
+        },
         'misc_args' => [
           'phoo',
           ';',
@@ -119,24 +119,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' c (number)
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' c (number)
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -145,6 +127,24 @@
       ],
       'cmdname' => 'firstparagraphindent',
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' c (number)
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' c (number)
+'
+            ]
+          },
+          'parent' => {}
+        },
         'misc_args' => [
           'none'
         ],
@@ -212,24 +212,6 @@
               'parent' => {},
               'text' => ' ',
               'type' => 'spaces_at_end'
-            },
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' pagesizes  (line)
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' pagesizes  (line)
-'
-                ]
-              },
-              'parent' => {}
             }
           ],
           'parent' => {},
@@ -238,6 +220,24 @@
       ],
       'cmdname' => 'pagesizes',
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' pagesizes  (line)
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' pagesizes  (line)
+'
+            ]
+          },
+          'parent' => {}
+        },
         'misc_content' => [
           {}
         ],
@@ -336,21 +336,21 @@
 };
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0];
-$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0];
 $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0];
-$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0];
 $result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0];
-$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0];
 $result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[3];
 $result_trees{'comments_on_misc_command_line'}{'contents'}[3]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
@@ -360,9 +360,9 @@
 $result_trees{'comments_on_misc_command_line'}{'contents'}[6]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0];
-$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 $result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[8];

Modified: trunk/tp/t/results/xml_tests/raw_and_comments.pl
===================================================================
--- trunk/tp/t/results/xml_tests/raw_and_comments.pl    2018-09-09 16:03:26 UTC 
(rev 8161)
+++ trunk/tp/t/results/xml_tests/raw_and_comments.pl    2018-09-11 20:49:04 UTC 
(rev 8162)
@@ -10,26 +10,7 @@
     {
       'args' => [
         {
-          'contents' => [
-            {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' comment
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' comment
-'
-                ]
-              },
-              'parent' => {}
-            }
-          ],
+          'contents' => [],
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -59,24 +40,6 @@
                   'parent' => {},
                   'text' => '  ',
                   'type' => 'spaces_at_end'
-                },
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' other comment
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'comment',
-                  'extra' => {
-                    'misc_args' => [
-                      ' other comment
-'
-                    ]
-                  },
-                  'parent' => {}
                 }
               ],
               'parent' => {},
@@ -86,6 +49,24 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'tex',
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' other comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'comment',
+              'extra' => {
+                'misc_args' => [
+                  ' other comment
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'tex'
           },
@@ -98,6 +79,24 @@
         }
       ],
       'extra' => {
+        'comment_at_end' => {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => ' comment
+',
+              'type' => 'misc_arg'
+            }
+          ],
+          'cmdname' => 'c',
+          'extra' => {
+            'misc_args' => [
+              ' comment
+'
+            ]
+          },
+          'parent' => {}
+        },
         'end_command' => {},
         'spaces_before_argument' => '  '
       },
@@ -124,26 +123,7 @@
         {
           'args' => [
             {
-              'contents' => [
-                {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => ' in xml comment
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      ' in xml comment
-'
-                    ]
-                  },
-                  'parent' => {}
-                }
-              ],
+              'contents' => [],
               'parent' => {},
               'type' => 'block_line_arg'
             }
@@ -173,24 +153,6 @@
                       'parent' => {},
                       'text' => '  ',
                       'type' => 'spaces_at_end'
-                    },
-                    {
-                      'args' => [
-                        {
-                          'parent' => {},
-                          'text' => ' end xml comment
-',
-                          'type' => 'misc_arg'
-                        }
-                      ],
-                      'cmdname' => 'comment',
-                      'extra' => {
-                        'misc_args' => [
-                          ' end xml comment
-'
-                        ]
-                      },
-                      'parent' => {}
                     }
                   ],
                   'parent' => {},
@@ -200,6 +162,24 @@
               'cmdname' => 'end',
               'extra' => {
                 'command_argument' => 'xml',
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' end xml comment
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'comment',
+                  'extra' => {
+                    'misc_args' => [
+                      ' end xml comment
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'xml'
               },
@@ -212,6 +192,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' in xml comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' in xml comment
+'
+                ]
+              },
+              'parent' => {}
+            },
             'end_command' => {},
             'spaces_before_argument' => ' '
           },
@@ -229,32 +227,32 @@
   ],
   'type' => 'text_root'
 };
-$result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0];
 $result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0];
 $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'raw_and_comments'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0];
 $result_trees{'raw_and_comments'}{'contents'}[0]{'extra'}{'end_command'} = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1];
 $result_trees{'raw_and_comments'}{'contents'}[0]{'parent'} = 
$result_trees{'raw_and_comments'};
 $result_trees{'raw_and_comments'}{'contents'}[1]{'parent'} = 
$result_trees{'raw_and_comments'};
 $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[2];
-$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[2];
 $result_trees{'raw_and_comments'}{'contents'}[2]{'parent'} = 
$result_trees{'raw_and_comments'};




reply via email to

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