texinfo-commits
[Top][All Lists]
Advanced

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

[8391] set comment_at_end on element not parent


From: gavinsmith0123
Subject: [8391] set comment_at_end on element not parent
Date: Wed, 24 Oct 2018 09:05:32 -0400 (EDT)

Revision: 8391
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8391
Author:   gavin
Date:     2018-10-24 09:05:32 -0400 (Wed, 24 Oct 2018)
Log Message:
-----------
set comment_at_end on element not parent

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Converter.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/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/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/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/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-10-24 09:46:04 UTC (rev 8390)
+++ trunk/ChangeLog     2018-10-24 13:05:32 UTC (rev 8391)
@@ -1,3 +1,17 @@
+2018-10-24  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Parser.pm (_isolate_last_space): Set 
+       'comment_at_end' value on element instead of parent.  As well as 
+       gaining consistency with 'spaces_after_argument', this means 
+       that a comment at the end of a brace command argument is not 
+       lost or output at the wrong place.  Add a comment noting that 
+       comments should not be inside brace commands anyway.
+
+       * tp/Texinfo/Convert/TexinfoXML.pm (_convert_argument_and_end_line),
+       * tp/Texinfo/Convert/Texinfo.pm (convert, _expand_cmd_args_to_texi):
+       * tp/Texinfo/Convert/Converter.pm _expand_cmd_args_to_texi): 
+       Access 'comment_at_end' in the new place.
+
 2018-10-23  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Parser.pm: Change 'same than' to 'same as' in

Modified: trunk/tp/Texinfo/Convert/Converter.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Converter.pm       2018-10-24 09:46:04 UTC (rev 
8390)
+++ trunk/tp/Texinfo/Convert/Converter.pm       2018-10-24 13:05:32 UTC (rev 
8391)
@@ -1021,8 +1021,8 @@
 
   my $end_line;
 
-  my $comment = $root->{'extra'}->{'comment_at_end'}
-    if $root->{'extra'};
+  my $comment = $root->{'args'}->[-1]->{'extra'}->{'comment_at_end'}
+    if $root->{'args'}->[-1]->{'extra'};
 
   if ($comment) {
     $end_line = $self->convert_tree($comment);

Modified: trunk/tp/Texinfo/Convert/Texinfo.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Texinfo.pm 2018-10-24 09:46:04 UTC (rev 8390)
+++ trunk/tp/Texinfo/Convert/Texinfo.pm 2018-10-24 13:05:32 UTC (rev 8391)
@@ -1,6 +1,6 @@
 # Texinfo.pm: output a Texinfo tree as Texinfo.
 #
-# Copyright 2010, 2011, 2012, 2016, 2017, 2018 Free Software Foundation, Inc.
+# Copyright 2010-2018 Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -88,16 +88,16 @@
       }
     }
     if (defined($root->{'contents'})) {
-      die "bad contents type(" . ref($root->{'contents'})
-          . ") $root->{'contents'}\n" if (ref($root->{'contents'}) ne 'ARRAY');
       foreach my $child (@{$root->{'contents'}}) {
         $result .= convert($child);
       }
     }
-    if ($root->{'extra'}
-        and $root->{'extra'}->{'spaces_after_argument'}) {
-       $result .= $root->{'extra'}->{'spaces_after_argument'};
+    if ($root->{'extra'} and $root->{'extra'}->{'spaces_after_argument'}) {
+      $result .= $root->{'extra'}->{'spaces_after_argument'};
     }
+    if ($root->{'extra'} and $root->{'extra'}->{'comment_at_end'}) {
+      $result .= convert($root->{'extra'}->{'comment_at_end'});
+    }
     $result .= '}' if ($root->{'type'}
                        and ($root->{'type'} eq 'bracketed'
                             or $root->{'type'} eq 'bracketed_def_content'));
@@ -205,8 +205,6 @@
       if $cmd->{'extra'} and $cmd->{'extra'}->{'spaces_before_argument'};
   }
   $result .= '{'.$cmd->{'type'}.'}' if ($cmdname eq 'value');
-  $result .= convert($cmd->{'extra'}->{'comment_at_end'})
-     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-10-24 09:46:04 UTC (rev 
8390)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm      2018-10-24 13:05:32 UTC (rev 
8391)
@@ -688,8 +688,8 @@
     $converted .= $root->{'args'}->[-1]->{'extra'}->{'spaces_after_argument'};
   }
 
-  if ($root->{'extra'} and $root->{'extra'}->{'comment_at_end'}) {
-    $end_line = $self->convert_tree($root->{'extra'}->{'comment_at_end'});
+  if ($root->{'args'}->[-1]->{'extra'} and 
$root->{'args'}->[-1]->{'extra'}->{'comment_at_end'}) {
+    $end_line = 
$self->convert_tree($root->{'args'}->[-1]->{'extra'}->{'comment_at_end'});
   } else {
     if (chomp($converted)) {
       $end_line = "\n";
@@ -828,8 +828,8 @@
         if ($root->{'args'}->[0]->{'extra'} and 
$root->{'args'}->[0]->{'extra'}->{'spaces_after_argument'}) {
           $result .= 
$root->{'args'}->[0]->{'extra'}->{'spaces_after_argument'};
          }
-        if ($root->{'extra'} and $root->{'extra'}->{'comment_at_end'}) {
-          $result .= $self->_convert($root->{'extra'}->{'comment_at_end'});
+        if ($root->{'args'}->[-1]->{'extra'} and 
$root->{'args'}->[-1]->{'extra'}->{'comment_at_end'}) {
+          $result .= 
$self->_convert($root->{'args'}->[-1]->{'extra'}->{'comment_at_end'});
         }
         pop @{$self->{'document_context'}->[-1]->{'monospace'}} 
           if (defined($in_monospace_not_normal));

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-10-24 09:46:04 UTC (rev 8390)
+++ trunk/tp/Texinfo/Parser.pm  2018-10-24 13:05:32 UTC (rev 8391)
@@ -2101,8 +2101,9 @@
       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'}}; 
+     $current->{'extra'}->{'comment_at_end'} = pop @{$current->{'contents'}}; 
+     # TODO: @c should probably not be allowed inside most brace commands
+     # as this would be difficult to implement properly in TeX.
   }
 
   return if address@hidden>{'contents'}}

Modified: trunk/tp/t/results/alias/simple.pl
===================================================================
--- trunk/tp/t/results/alias/simple.pl  2018-10-24 09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/alias/simple.pl  2018-10-24 13:05:32 UTC (rev 8391)
@@ -55,6 +55,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -63,24 +81,6 @@
       ],
       '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'
@@ -192,9 +192,9 @@
 $result_trees{'simple'}{'contents'}[0]{'parent'} = $result_trees{'simple'};
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'simple'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'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-10-24 09:46:04 UTC 
(rev 8390)
+++ trunk/tp/t/results/columnfractions/empty_comment.pl 2018-10-24 13:05:32 UTC 
(rev 8391)
@@ -15,6 +15,26 @@
               'args' => [
                 {
                   'contents' => [],
+                  'extra' => {
+                    'comment_at_end' => {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => '
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'c',
+                      'extra' => {
+                        'misc_args' => [
+                          '
+'
+                        ]
+                      },
+                      'parent' => {}
+                    }
+                  },
                   'parent' => {},
                   'type' => 'line_arg'
                 }
@@ -21,24 +41,6 @@
               ],
               'cmdname' => 'columnfractions',
               'extra' => {
-                'comment_at_end' => {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => '
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  },
-                  'parent' => {}
-                },
                 'missing_argument' => 1,
                 'spaces_before_argument' => ' '
               },
@@ -94,9 +96,9 @@
   ],
   'type' => 'text_root'
 };
+$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[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]{'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-10-24 09:46:04 UTC 
(rev 8390)
+++ trunk/tp/t/results/columnfractions/good_comment.pl  2018-10-24 13:05:32 UTC 
(rev 8391)
@@ -20,6 +20,26 @@
                       'text' => '0.4 .6 5.'
                     }
                   ],
+                  'extra' => {
+                    'comment_at_end' => {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => ' comment
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'c',
+                      'extra' => {
+                        'misc_args' => [
+                          ' comment
+'
+                        ]
+                      },
+                      'parent' => {}
+                    }
+                  },
                   'parent' => {},
                   'type' => 'line_arg'
                 }
@@ -26,24 +46,6 @@
               ],
               '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 +107,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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[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]{'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-10-24 
09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/columnfractions/good_space_comment.pl    2018-10-24 
13:05:32 UTC (rev 8391)
@@ -21,6 +21,24 @@
                     }
                   ],
                   'extra' => {
+                    'comment_at_end' => {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => ' space comment
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'c',
+                      'extra' => {
+                        'misc_args' => [
+                          ' space comment
+'
+                        ]
+                      },
+                      'parent' => {}
+                    },
                     'spaces_after_argument' => '  '
                   },
                   'parent' => {},
@@ -29,24 +47,6 @@
               ],
               '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'
@@ -107,9 +107,9 @@
   'type' => 'text_root'
 };
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[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]{'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/index_entry_in_preformatted.pl
===================================================================
--- trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl  
2018-10-24 09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl  
2018-10-24 13:05:32 UTC (rev 8391)
@@ -113,6 +113,24 @@
                         }
                       ],
                       'extra' => {
+                        'comment_at_end' => {
+                          'args' => [
+                            {
+                              'parent' => {},
+                              'text' => ' comment
+',
+                              'type' => 'misc_arg'
+                            }
+                          ],
+                          'cmdname' => 'c',
+                          'extra' => {
+                            'misc_args' => [
+                              ' comment
+'
+                            ]
+                          },
+                          'parent' => {}
+                        },
                         'spaces_after_argument' => ' '
                       },
                       'parent' => {},
@@ -121,24 +139,6 @@
                   ],
                   'cmdname' => 'cindex',
                   'extra' => {
-                    'comment_at_end' => {
-                      'args' => [
-                        {
-                          'parent' => {},
-                          'text' => ' comment
-',
-                          'type' => 'misc_arg'
-                        }
-                      ],
-                      'cmdname' => 'c',
-                      'extra' => {
-                        'misc_args' => [
-                          ' comment
-'
-                        ]
-                      },
-                      'parent' => {}
-                    },
                     'index_entry' => {
                       'command' => {},
                       'content' => [],
@@ -292,9 +292,9 @@
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'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'}[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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'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]{'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'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$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]{'args'}[0]{'contents'};

Modified: trunk/tp/t/results/coverage/comment_on_cartouche_line.pl
===================================================================
--- trunk/tp/t/results/coverage/comment_on_cartouche_line.pl    2018-10-24 
09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/coverage/comment_on_cartouche_line.pl    2018-10-24 
13:05:32 UTC (rev 8391)
@@ -11,6 +11,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -60,24 +80,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comment
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comment
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -91,6 +93,8 @@
   ],
   'type' => 'text_root'
 };
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'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];
@@ -97,8 +101,6 @@
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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-10-24 
09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/coverage/comment_on_group_line.pl        2018-10-24 
13:05:32 UTC (rev 8391)
@@ -11,6 +11,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -60,24 +80,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comment
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comment
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -91,6 +93,8 @@
   ],
   'type' => 'text_root'
 };
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'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];
@@ -97,8 +101,6 @@
 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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-10-24 
09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/coverage/formats_only_title_comments.pl  2018-10-24 
13:05:32 UTC (rev 8391)
@@ -114,6 +114,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment on enumerate line
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment on enumerate line
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -187,24 +207,6 @@
         }
       ],
       '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' => ' '
@@ -345,6 +347,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment on vtable line
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment on vtable line
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -403,24 +423,6 @@
       ],
       'extra' => {
         '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' => ' '
       },
@@ -569,6 +571,8 @@
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'formats_only_title_comments'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'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];
@@ -578,8 +582,6 @@
 
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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'};
@@ -599,6 +601,8 @@
 $result_trees{'formats_only_title_comments'}{'contents'}[4]{'parent'} = 
$result_trees{'formats_only_title_comments'};
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'formats_only_title_comments'}{'contents'}[6]{'args'}[0]{'extra'}{'comment_at_end'}{'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];
@@ -607,8 +611,6 @@
 
$result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[6]{'contents'}[1];
 
$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'}{'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-10-24 09:46:04 UTC (rev 
8390)
+++ trunk/tp/t/results/coverage/table.pl        2018-10-24 13:05:32 UTC (rev 
8391)
@@ -191,6 +191,26 @@
               'type' => 'command_as_argument'
             }
           ],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' samp
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' samp
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -384,6 +404,24 @@
                         }
                       ],
                       'extra' => {
+                        'comment_at_end' => {
+                          'args' => [
+                            {
+                              'parent' => {},
+                              'text' => ' comment in itemx line
+',
+                              'type' => 'misc_arg'
+                            }
+                          ],
+                          'cmdname' => 'comment',
+                          'extra' => {
+                            'misc_args' => [
+                              ' comment in itemx line
+'
+                            ]
+                          },
+                          'parent' => {}
+                        },
                         'spaces_after_argument' => ' '
                       },
                       'parent' => {},
@@ -392,24 +430,6 @@
                   ],
                   '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' => [],
@@ -483,24 +503,6 @@
       ],
       'extra' => {
         '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' => ' '
       },
@@ -534,6 +536,8 @@
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'table'}{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'}{'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];
@@ -561,9 +565,9 @@
 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'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]{'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'}
 = 
$result_trees{'table'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$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]{'args'}[0]{'contents'};
@@ -576,8 +580,6 @@
 $result_trees{'table'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'table'}{'contents'}[3]{'contents'}[2];
 $result_trees{'table'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'table'}{'contents'}[3];
 $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-10-24 
09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/coverage/table_command_comment.pl        2018-10-24 
13:05:32 UTC (rev 8391)
@@ -23,6 +23,26 @@
               'type' => 'command_as_argument'
             }
           ],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' in comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' in comment
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -98,24 +118,6 @@
       ],
       'extra' => {
         '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' => ' '
       },
@@ -126,6 +128,8 @@
   '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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'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]{'parent'}
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -136,8 +140,6 @@
 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1];
 $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'}{'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-10-24 
09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/float/comment_space_comand_in_float.pl   2018-10-24 
13:05:32 UTC (rev 8391)
@@ -65,6 +65,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' float
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' float
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -116,24 +134,6 @@
             }
           ],
           'extra' => {
-            'comment_at_end' => {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' float
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' float
-'
-                ]
-              },
-              'parent' => {}
-            },
             'end_command' => {},
             'node_content' => [
               {},
@@ -173,6 +173,26 @@
                   'parent' => {}
                 }
               ],
+              'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' listoffloats
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' listoffloats
+'
+                    ]
+                  },
+                  'parent' => {}
+                }
+              },
               'parent' => {},
               'type' => 'line_arg'
             }
@@ -179,24 +199,6 @@
           ],
           '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' => [],
@@ -243,6 +245,8 @@
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[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]{'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];
@@ -249,8 +253,6 @@
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'comment_space_comand_in_float'}{'contents'}[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];
@@ -259,9 +261,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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'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]{'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'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'comment_space_comand_in_float'}{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -322,15 +324,6 @@
     {
       'cmdname' => 'float',
       'extra' => {
-        'comment_at_end' => {
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' float
-'
-            ]
-          }
-        },
         'end_command' => {
           'cmdname' => 'end',
           'extra' => {

Modified: trunk/tp/t/results/itemize/accent_argument.pl
===================================================================
--- trunk/tp/t/results/itemize/accent_argument.pl       2018-10-24 09:46:04 UTC 
(rev 8390)
+++ trunk/tp/t/results/itemize/accent_argument.pl       2018-10-24 13:05:32 UTC 
(rev 8391)
@@ -23,6 +23,26 @@
               'type' => 'command_as_argument'
             }
           ],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'comment',
+              'extra' => {
+                'misc_args' => [
+                  '
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -87,24 +107,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'comment',
-          'extra' => {
-            'misc_args' => [
-              '
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -211,6 +213,8 @@
   '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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'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];
@@ -218,8 +222,6 @@
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1];
 $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'accent_argument'}{'contents'}[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-10-24 09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/itemize/comment_first_on_enumerate_line.pl       
2018-10-24 13:05:32 UTC (rev 8391)
@@ -11,6 +11,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment on enumerate line
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment on enumerate line
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -75,24 +95,6 @@
         }
       ],
       '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' => ' '
@@ -107,6 +109,8 @@
   ],
   'type' => 'text_root'
 };
+$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'args'}[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]{'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];
@@ -114,8 +118,6 @@
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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-10-24 
09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/itemize/comment_first_on_itemize_line.pl 2018-10-24 
13:05:32 UTC (rev 8391)
@@ -17,6 +17,26 @@
         },
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment on itemize line
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment on itemize line
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -82,24 +102,6 @@
       ],
       'extra' => {
         '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' => ' '
       },
@@ -114,6 +116,8 @@
   'type' => 'text_root'
 };
 
$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]{'args'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[1];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[1]{'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];
@@ -122,8 +126,6 @@
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[1];
 
$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'}{'command_as_argument'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[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'}[1];
 
$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-10-24 09:46:04 UTC 
(rev 8390)
+++ trunk/tp/t/results/itemize/enumerate_argument.pl    2018-10-24 13:05:32 UTC 
(rev 8391)
@@ -84,6 +84,26 @@
               'text' => 'A'
             }
           ],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -122,24 +142,6 @@
         }
       ],
       'extra' => {
-        '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' => ' '
@@ -167,6 +169,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -207,24 +227,6 @@
         }
       ],
       'extra' => {
-        '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' => ' '
@@ -248,22 +250,22 @@
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'enumerate_argument'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'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]{'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'}{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'enumerate_argument'}{'contents'}[4]{'args'}[0]{'extra'}{'comment_at_end'}{'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]{'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'}{'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-10-24 
09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/itemize/enumerate_argument_item.pl       2018-10-24 
13:05:32 UTC (rev 8391)
@@ -136,6 +136,26 @@
               'text' => 'A'
             }
           ],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -226,24 +246,6 @@
         }
       ],
       'extra' => {
-        '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' => ' '
@@ -271,6 +273,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -363,24 +383,6 @@
         }
       ],
       'extra' => {
-        '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' => ' '
@@ -410,6 +412,8 @@
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'enumerate_argument_item'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'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];
@@ -420,12 +424,12 @@
 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$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'}{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'enumerate_argument_item'}{'contents'}[4]{'args'}[0]{'extra'}{'comment_at_end'}{'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];
@@ -436,8 +440,6 @@
 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$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'}{'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-10-24 09:46:04 UTC 
(rev 8390)
+++ trunk/tp/t/results/menu/comment_on_menu_line.pl     2018-10-24 13:05:32 UTC 
(rev 8391)
@@ -41,6 +41,26 @@
           'args' => [
             {
               'contents' => [],
+              'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      '
+'
+                    ]
+                  },
+                  'parent' => {}
+                }
+              },
               'parent' => {},
               'type' => 'block_line_arg'
             }
@@ -136,24 +156,6 @@
             }
           ],
           'extra' => {
-            'comment_at_end' => {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => '
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  '
-'
-                ]
-              },
-              'parent' => {}
-            },
             'end_command' => {},
             'spaces_before_argument' => '  '
           },
@@ -268,6 +270,8 @@
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'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]{'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];
@@ -282,8 +286,6 @@
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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];
@@ -367,15 +369,6 @@
     {
       'cmdname' => 'menu',
       'extra' => {
-        'comment_at_end' => {
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              '
-'
-            ]
-          }
-        },
         'end_command' => {
           'cmdname' => 'end',
           'extra' => {

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-10-24 09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl   
2018-10-24 13:05:32 UTC (rev 8391)
@@ -22,6 +22,26 @@
                   'parent' => {}
                 }
               ],
+              'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' settittle
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' settittle
+'
+                    ]
+                  },
+                  'parent' => {}
+                }
+              },
               'parent' => {},
               'type' => 'line_arg'
             }
@@ -28,24 +48,6 @@
           ],
           'cmdname' => 'settitle',
           'extra' => {
-            'comment_at_end' => {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' settittle
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' settittle
-'
-                ]
-              },
-              'parent' => {}
-            },
             'spaces_before_argument' => ' '
           },
           'line_nr' => {
@@ -75,6 +77,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' @node Top
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'comment',
+              'extra' => {
+                'misc_args' => [
+                  ' @node Top
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => '  '
           },
           'parent' => {},
@@ -84,24 +104,6 @@
       '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' => [
           {}
         ],
@@ -135,6 +137,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' @top
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'comment',
+              'extra' => {
+                'misc_args' => [
+                  ' @top
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -159,6 +179,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comment frenchspacing
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comment frenchspacing
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -167,24 +205,6 @@
           ],
           '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'
             ],
@@ -217,6 +237,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' index entry
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' index entry
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -225,24 +263,6 @@
           ],
           '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' => [],
@@ -285,6 +305,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' heading
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' heading
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => '    '
               },
               'parent' => {},
@@ -293,24 +331,6 @@
           ],
           'cmdname' => 'heading',
           'extra' => {
-            'comment_at_end' => {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' heading
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' heading
-'
-                ]
-              },
-              'parent' => {}
-            },
             'spaces_before_argument' => ' '
           },
           'level' => 2,
@@ -337,6 +357,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' printindex 
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' printindex 
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -345,24 +383,6 @@
           ],
           'cmdname' => 'printindex',
           'extra' => {
-            'comment_at_end' => {
-              'args' => [
-                {
-                  'parent' => {},
-                  'text' => ' printindex 
-',
-                  'type' => 'misc_arg'
-                }
-              ],
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' printindex 
-'
-                ]
-              },
-              'parent' => {}
-            },
             'misc_args' => [
               'cp'
             ],
@@ -432,6 +452,24 @@
                     }
                   ],
                   'extra' => {
+                    'comment_at_end' => {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => ' end
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'c',
+                      'extra' => {
+                        'misc_args' => [
+                          ' end
+'
+                        ]
+                      },
+                      'parent' => {}
+                    },
                     'spaces_after_argument' => ' '
                   },
                   'parent' => {},
@@ -441,24 +479,6 @@
               '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'
               },
@@ -510,6 +530,26 @@
                   'parent' => {}
                 }
               ],
+              'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' listoffloats
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' listoffloats
+'
+                    ]
+                  },
+                  'parent' => {}
+                }
+              },
               'parent' => {},
               'type' => 'line_arg'
             }
@@ -516,24 +556,6 @@
           ],
           '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' => [],
@@ -555,24 +577,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' @top
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'comment',
-          'extra' => {
-            'misc_args' => [
-              ' @top
-'
-            ]
-          },
-          'parent' => {}
-        },
         'spaces_before_argument' => ' '
       },
       'level' => 0,
@@ -600,34 +604,36 @@
 };
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[0]{'args'}[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]{'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]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[0];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'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]{'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'};
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'args'}[0]{'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]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'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]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'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]{'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'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
@@ -636,15 +642,15 @@
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'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]{'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]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'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]{'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];
@@ -654,9 +660,9 @@
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[0];
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'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]{'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'}{'end_command'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'extra'}{'float_section'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[2];
@@ -666,14 +672,12 @@
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'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]{'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'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
 
$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]{'parent'} = 
$result_trees{'comment_space_command_on_line'};
 
$result_trees{'comment_space_command_on_line'}{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[3];
 $result_trees{'comment_space_command_on_line'}{'contents'}[3]{'parent'} = 
$result_trees{'comment_space_command_on_line'};
@@ -726,28 +730,10 @@
         '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,
@@ -763,28 +749,10 @@
     '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' => ' '
   },
@@ -805,15 +773,6 @@
 $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' => ' '
   }
@@ -831,15 +790,6 @@
           'cmdname' => 'end',
           'extra' => {
             'command_argument' => 'float',
-            'comment_at_end' => {
-              'cmdname' => 'c',
-              'extra' => {
-                'misc_args' => [
-                  ' end
-'
-                ]
-              }
-            },
             'spaces_before_argument' => ' ',
             'text_arg' => 'float'
           }
@@ -847,15 +797,6 @@
         'float_section' => {
           'cmdname' => 'top',
           'extra' => {
-            'comment_at_end' => {
-              'cmdname' => 'comment',
-              'extra' => {
-                'misc_args' => [
-                  ' @top
-'
-                ]
-              }
-            },
             'spaces_before_argument' => ' '
           },
           'level' => 0
@@ -929,15 +870,15 @@
 ';
 
 
-$result_converted{'docbook'}->{'comment_space_command_on_line'} = 
'<title>Settitle &#160;</title><!-- settittle -->
+$result_converted{'docbook'}->{'comment_space_command_on_line'} = 
'<title>Settitle &#160;</title>
 
 <chapter label="" id="Top">
-<title>top element&#160;</title><!-- @top -->
+<title>top element&#160;</title>
 
 
 <indexterm role="cp"><primary>index entry &#160;</primary></indexterm><!-- 
index entry -->
 
-<bridgehead renderas="sect1">Heading &#160;</bridgehead><!-- heading -->
+<bridgehead renderas="sect1">Heading &#160;</bridgehead>
 
 <index role="cp"></index>
 
@@ -984,13 +925,13 @@
 <node name="Top" spaces=" "><nodename trailingspaces="  
">Top</nodename><nodeup automatic="on">(dir)</nodeup></node><!-- comment @node 
Top -->
 <top spaces=" "><sectiontitle>top element<spacecmd type="spc"/> 
</sectiontitle><!-- comment @top -->
 
-<frenchspacing value="on" line="on "></frenchspacing><!-- c comment 
frenchspacing -->
+<frenchspacing value="on" line="on @c comment 
frenchspacing"></frenchspacing><!-- c comment frenchspacing -->
 
 <cindex index="cp" spaces=" "><indexterm index="cp" number="1">index entry 
<spacecmd type="spc"/></indexterm></cindex><!-- c index entry -->
 
 <heading spaces=" ">Heading <spacecmd type="spc"/>    </heading><!-- c heading 
-->
 
-<printindex value="cp" line="cp "></printindex><!-- c printindex  -->
+<printindex value="cp" line="cp @c printindex "></printindex><!-- c printindex 
 -->
 
 <float name="label" type="Text" number="1" spaces=" " endspaces=" 
"><floattype>Text</floattype><floatname spaces=" ">label</floatname>
 <para>float

Modified: trunk/tp/t/results/misc_commands/setfilename.pl
===================================================================
--- trunk/tp/t/results/misc_commands/setfilename.pl     2018-10-24 09:46:04 UTC 
(rev 8390)
+++ trunk/tp/t/results/misc_commands/setfilename.pl     2018-10-24 13:05:32 UTC 
(rev 8391)
@@ -16,6 +16,26 @@
               'text' => 'file_comment'
             }
           ],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'line_arg'
         }
@@ -22,24 +42,6 @@
       ],
       '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'
       },
@@ -89,6 +91,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -97,24 +117,6 @@
       ],
       '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'
       },
@@ -190,17 +192,17 @@
   '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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'setfilename'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'setfilename'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'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]{'parent'} = 
$result_trees{'setfilename'}{'contents'}[1];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'setfilename'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'setfilename'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'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-10-24 09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/multitable/prototype_brace_no_brace_comment.pl   
2018-10-24 13:05:32 UTC (rev 8391)
@@ -26,6 +26,26 @@
               'text' => ' bb'
             }
           ],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' cc
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'comment',
+              'extra' => {
+                'misc_args' => [
+                  ' cc
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -64,24 +84,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' cc
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'comment',
-          'extra' => {
-            'misc_args' => [
-              ' cc
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'max_columns' => 2,
         'prototypes' => [
@@ -120,12 +122,12 @@
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[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]{'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]{'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-10-24 
09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/quotation/comment_on_quotation_line.pl   2018-10-24 
13:05:32 UTC (rev 8391)
@@ -20,6 +20,26 @@
               'parent' => {}
             }
           ],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' quotation 
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' quotation 
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -69,24 +89,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' quotation 
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' quotation 
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -102,6 +104,8 @@
 };
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'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];
@@ -108,8 +112,6 @@
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[1];
 
$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'}{'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-10-24 09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/quotation/only_comment_on_quotation_line.pl      
2018-10-24 13:05:32 UTC (rev 8391)
@@ -11,6 +11,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -60,24 +80,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comment
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comment
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -91,6 +93,8 @@
   ],
   'type' => 'text_root'
 };
+$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'args'}[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]{'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];
@@ -97,8 +101,6 @@
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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-10-24 09:46:04 UTC (rev 
8390)
+++ trunk/tp/t/results/raw/misc_raw_comments.pl 2018-10-24 13:05:32 UTC (rev 
8391)
@@ -17,6 +17,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment space
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment space
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -42,6 +62,26 @@
                   'text' => 'html'
                 }
               ],
+              'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comment no space
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comment no space
+'
+                    ]
+                  },
+                  'parent' => {}
+                }
+              },
               'parent' => {},
               'type' => 'line_arg'
             }
@@ -49,24 +89,6 @@
           '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'
           },
@@ -79,24 +101,6 @@
         }
       ],
       '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' => ' '
       },
@@ -142,6 +146,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comment after end tex
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comment after end tex
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => '    '
               },
               'parent' => {},
@@ -151,24 +173,6 @@
           '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'
           },
@@ -239,16 +243,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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'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]{'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'};
@@ -255,9 +259,9 @@
 
$result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[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]{'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'}{'end_command'} = 
$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[3]{'parent'} = 
$result_trees{'misc_raw_comments'};

Modified: trunk/tp/t/results/sectioning/empty_nodes_with_commands.pl
===================================================================
--- trunk/tp/t/results/sectioning/empty_nodes_with_commands.pl  2018-10-24 
09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/sectioning/empty_nodes_with_commands.pl  2018-10-24 
13:05:32 UTC (rev 8391)
@@ -23,6 +23,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'line_arg'
         }
@@ -37,24 +57,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comment
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comment
-'
-            ]
-          },
-          'parent' => {}
-        },
         'nodes_manuals' => [
           undef
         ],
@@ -194,10 +196,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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'empty_nodes_with_commands'}{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'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-10-24 09:46:04 UTC 
(rev 8390)
+++ trunk/tp/t/results/sectioning/empty_ref_arg.pl      2018-10-24 13:05:32 UTC 
(rev 8391)
@@ -249,6 +249,24 @@
                     }
                   ],
                   'extra' => {
+                    'comment_at_end' => {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => ' ggg
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'c',
+                      'extra' => {
+                        'misc_args' => [
+                          ' ggg
+'
+                        ]
+                      },
+                      'parent' => {}
+                    },
                     'spaces_after_argument' => '
 ',
                     'spaces_before_argument' => ' '
@@ -278,6 +296,24 @@
                     }
                   ],
                   'extra' => {
+                    'comment_at_end' => {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => '
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'c',
+                      'extra' => {
+                        'misc_args' => [
+                          '
+'
+                        ]
+                      },
+                      'parent' => {}
+                    },
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -287,24 +323,6 @@
               'cmdname' => 'ref',
               'contents' => [],
               'extra' => {
-                'comment_at_end' => {
-                  'args' => [
-                    {
-                      'parent' => {},
-                      'text' => '
-',
-                      'type' => 'misc_arg'
-                    }
-                  ],
-                  'cmdname' => 'c',
-                  'extra' => {
-                    'misc_args' => [
-                      '
-'
-                    ]
-                  },
-                  'parent' => {}
-                },
                 'label' => {},
                 'node_argument' => {
                   'node_content' => [
@@ -390,12 +408,14 @@
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[1]{'extra'}{'comment_at_end'}{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[2]{'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]{'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];
@@ -412,9 +432,10 @@
 @ref{Top, @ , @:}
 @ref{Top, @c aaa
  @ 
address@hidden ggg
 , @c fff
address@hidden
-
address@hidden
+}
 ';
 
 

Modified: trunk/tp/t/results/sectioning/node.pl
===================================================================
--- trunk/tp/t/results/sectioning/node.pl       2018-10-24 09:46:04 UTC (rev 
8390)
+++ trunk/tp/t/results/sectioning/node.pl       2018-10-24 13:05:32 UTC (rev 
8391)
@@ -394,6 +394,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'comment',
+              'extra' => {
+                'misc_args' => [
+                  '
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -410,24 +428,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'comment',
-          'extra' => {
-            'misc_args' => [
-              '
-'
-            ]
-          },
-          'parent' => {}
-        },
         'node_content' => [
           {}
         ],
@@ -533,6 +533,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comma , end
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comma , end
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' ',
             'spaces_before_argument' => ' '
           },
@@ -543,24 +561,6 @@
       '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' => [
           {},
           {},
@@ -650,10 +650,10 @@
 
$result_trees{'node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'node'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'node'}{'contents'}[6]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'node'}{'contents'}[6]{'args'}[0]{'extra'}{'comment_at_end'}{'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'};
@@ -672,9 +672,9 @@
 
$result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'node'}{'contents'}[7]{'args'}[2]{'extra'}{'comment_at_end'}{'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/xml_tests/comments_end_lines.pl
===================================================================
--- trunk/tp/t/results/xml_tests/comments_end_lines.pl  2018-10-24 09:46:04 UTC 
(rev 8390)
+++ trunk/tp/t/results/xml_tests/comments_end_lines.pl  2018-10-24 13:05:32 UTC 
(rev 8391)
@@ -63,6 +63,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comment itemize
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comment itemize
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => '  '
               },
               'parent' => {},
@@ -72,24 +90,6 @@
           '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'
           },
@@ -140,6 +140,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comm
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -149,24 +167,6 @@
           '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'
           },
@@ -271,6 +271,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' table
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' table
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -280,24 +298,6 @@
           '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'
           },
@@ -356,6 +356,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' quot no arg
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' quot no arg
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -365,24 +383,6 @@
           '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'
           },
@@ -443,6 +443,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comm
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -452,24 +470,6 @@
           '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'
           },
@@ -530,6 +530,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comm
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -539,24 +557,6 @@
           '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'
           },
@@ -699,6 +699,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comm
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -708,24 +726,6 @@
           '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'
           },
@@ -802,6 +802,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comm
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => '  '
               },
               'parent' => {},
@@ -811,24 +829,6 @@
           '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'
           },
@@ -899,6 +899,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comm
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -908,24 +926,6 @@
           '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'
           },
@@ -986,6 +986,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' comm
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => ' '
               },
               'parent' => {},
@@ -995,24 +1013,6 @@
           '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'
           },
@@ -1044,9 +1044,9 @@
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'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]{'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'}{'command_as_argument'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'args'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2];
@@ -1055,9 +1055,9 @@
 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[2];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'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]{'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]{'parent'} = 
$result_trees{'comments_end_lines'};
@@ -1070,9 +1070,9 @@
 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'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]{'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'}{'command_as_argument'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1];
@@ -1084,9 +1084,9 @@
 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[1];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'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]{'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]{'parent'} = 
$result_trees{'comments_end_lines'};
@@ -1096,9 +1096,9 @@
 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[1];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'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]{'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]{'parent'} = 
$result_trees{'comments_end_lines'};
@@ -1108,9 +1108,9 @@
 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[1];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'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]{'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]{'parent'} = 
$result_trees{'comments_end_lines'};
@@ -1129,9 +1129,9 @@
 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'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]{'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];
 $result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1];
@@ -1145,9 +1145,9 @@
 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[0];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'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]{'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'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'node_content'}[0] 
= $result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[1]{'contents'}[0];
@@ -1159,9 +1159,9 @@
 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[1];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'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]{'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]{'parent'} = 
$result_trees{'comments_end_lines'};
@@ -1171,9 +1171,9 @@
 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[1];
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'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]{'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]{'parent'} = 
$result_trees{'comments_end_lines'};
@@ -1252,15 +1252,6 @@
           '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-10-24 09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl     
2018-10-24 13:05:32 UTC (rev 8391)
@@ -17,6 +17,26 @@
         },
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -82,24 +102,6 @@
       ],
       'extra' => {
         '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' => ' '
       },
@@ -126,6 +128,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -192,24 +212,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comm
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comm
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -243,6 +245,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -310,24 +330,6 @@
       ],
       'extra' => {
         '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' => ' '
       },
@@ -364,6 +366,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -431,24 +451,6 @@
       ],
       'extra' => {
         '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' => ' '
       },
@@ -465,6 +467,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -529,24 +551,6 @@
         }
       ],
       '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' => ' '
@@ -574,6 +578,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -640,24 +662,6 @@
         }
       ],
       'extra' => {
-        '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' => ' '
@@ -692,6 +696,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' table
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' table
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -773,24 +795,6 @@
       ],
       'extra' => {
         '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' => ' '
       },
@@ -807,6 +811,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' quot no arg
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' quot no arg
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -856,24 +880,6 @@
         }
       ],
       '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' => ' '
       },
@@ -900,6 +906,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' quot arg
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' quot arg
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -951,24 +975,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' quot arg
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' quot arg
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -989,6 +995,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -1038,24 +1064,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comm
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comm
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -1076,6 +1084,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -1125,24 +1153,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comm
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comm
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -1173,6 +1183,24 @@
                     }
                   ],
                   'extra' => {
+                    'comment_at_end' => {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => ' comm
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'c',
+                      'extra' => {
+                        'misc_args' => [
+                          ' comm
+'
+                        ]
+                      },
+                      'parent' => {}
+                    },
                     'spaces_after_argument' => ' '
                   },
                   'parent' => {},
@@ -1181,24 +1209,6 @@
               ],
               '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'
@@ -1357,6 +1367,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' c
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' c
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -1459,24 +1487,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' c
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' c
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'max_columns' => 2,
         'prototypes' => [
@@ -1532,6 +1542,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -1583,24 +1611,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comm
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comm
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'node_content' => [
           {}
@@ -1630,6 +1640,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -1679,24 +1709,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comm
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comm
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -1717,6 +1729,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comm
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comm
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -1766,24 +1798,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comm
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comm
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => ' '
       },
@@ -1804,6 +1818,8 @@
   'type' => 'text_root'
 };
 
$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]{'args'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[1]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[1]{'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];
@@ -1812,12 +1828,12 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1];
 
$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'}{'command_as_argument'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[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'}[1];
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'args'}[0]{'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]{'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];
@@ -1825,12 +1841,12 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$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'}{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'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]{'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];
@@ -1839,8 +1855,6 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[1];
 
$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'}{'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'};
@@ -1847,6 +1861,8 @@
 $result_trees{'comments_on_block_command_lines'}{'contents'}[5]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'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]{'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];
@@ -1855,12 +1871,12 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[1];
 
$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'}{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'args'}[0]{'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]{'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];
@@ -1868,12 +1884,12 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'args'}[0]{'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]{'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];
@@ -1881,12 +1897,12 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$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'}{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'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]{'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]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -1897,12 +1913,12 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[1];
 
$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'}{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'args'}[0]{'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]{'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];
@@ -1909,12 +1925,12 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'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]{'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];
@@ -1921,11 +1937,11 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$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'}{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'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]{'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];
@@ -1932,11 +1948,11 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'args'}[0]{'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]{'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];
@@ -1943,15 +1959,13 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[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]{'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];
@@ -1976,6 +1990,8 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0];
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'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]{'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];
@@ -1989,8 +2005,6 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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'};
@@ -2001,6 +2015,8 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0];
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'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]{'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];
@@ -2007,13 +2023,13 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1];
 
$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'}{'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'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'};
 $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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'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]{'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];
@@ -2020,11 +2036,11 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'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]{'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];
@@ -2031,8 +2047,6 @@
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]{'args'}[0]{'contents'}[0]{'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'};
@@ -2148,15 +2162,6 @@
     {
       'cmdname' => 'float',
       'extra' => {
-        'comment_at_end' => {
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comm
-'
-            ]
-          }
-        },
         'end_command' => {
           'cmdname' => 'end',
           'extra' => {
@@ -2226,7 +2231,7 @@
 <pre xml:space="preserve">in ex
 </pre></example>
 
-<multitable spaces=" " endspaces=" "><columnfractions line="0.4 0.6 
"><columnfraction value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions><!-- c comm -->
+<multitable spaces=" " endspaces=" "><columnfractions line="0.4 0.6 @c 
comm"><columnfraction value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions><!-- c comm -->
 <tbody><row><entry command="item" spaces=" "><para>a </para></entry><entry 
command="tab" spaces=" "><para>b
 </para></entry></row></tbody></multitable>
 

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-10-24 09:46:04 UTC (rev 8390)
+++ trunk/tp/t/results/xml_tests/comments_on_misc_command_line.pl       
2018-10-24 13:05:32 UTC (rev 8391)
@@ -17,6 +17,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' setfilename (text)
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' setfilename (text)
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => '  '
           },
           'parent' => {},
@@ -25,24 +43,6 @@
       ],
       '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'
       },
@@ -63,6 +63,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' definfoenclose (number)
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' definfoenclose (number)
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => '  '
           },
           'parent' => {},
@@ -71,24 +89,6 @@
       ],
       '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',
           ';',
@@ -113,6 +113,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' c (number)
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' c (number)
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -121,24 +139,6 @@
       ],
       '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'
         ],
@@ -190,6 +190,24 @@
             }
           ],
           'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' pagesizes  (line)
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' pagesizes  (line)
+'
+                ]
+              },
+              'parent' => {}
+            },
             'spaces_after_argument' => ' '
           },
           'parent' => {},
@@ -198,24 +216,6 @@
       ],
       'cmdname' => 'pagesizes',
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' pagesizes  (line)
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' pagesizes  (line)
-'
-            ]
-          },
-          'parent' => {}
-        },
         'spaces_before_argument' => ' '
       },
       'line_nr' => {
@@ -307,19 +307,19 @@
   'type' => 'text_root'
 };
 
$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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[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]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'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]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'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]{'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'};
@@ -326,9 +326,9 @@
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[4];
 $result_trees{'comments_on_misc_command_line'}{'contents'}[4]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'args'}[0];
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[5];
-$result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'extra'}{'comment_at_end'};
-$result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'args'}[0];
 $result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
 
$result_trees{'comments_on_misc_command_line'}{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[6];
 $result_trees{'comments_on_misc_command_line'}{'contents'}[6]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
@@ -363,8 +363,8 @@
 
 
 $result_converted{'xml'}->{'comments_on_misc_command_line'} = '<setfilename 
file="comments_on_misc_command_line.info" spaces="  
">comments_on_misc_command_line.info  </setfilename><!-- c setfilename (text) 
-->
-<definfoenclose command="phoo" open=";" close=":" line="phoo,;,:  
"></definfoenclose><!-- c definfoenclose (number) -->
-<firstparagraphindent value="none" line="none "></firstparagraphindent><!-- c 
c (number) -->
+<definfoenclose command="phoo" open=";" close=":" line="phoo,;,:  @c 
definfoenclose (number)"></definfoenclose><!-- c definfoenclose (number) -->
+<firstparagraphindent value="none" line="none @c c 
(number)"></firstparagraphindent><!-- c c (number) -->
 <raisesections line=" @c raisesections (skipline)"></raisesections>
 <insertcopying line="  @comment  (noarg)"></insertcopying>
 <pagesizes spaces=" ">200mm </pagesizes><!-- c pagesizes  (line) -->

Modified: trunk/tp/t/results/xml_tests/raw_and_comments.pl
===================================================================
--- trunk/tp/t/results/xml_tests/raw_and_comments.pl    2018-10-24 09:46:04 UTC 
(rev 8390)
+++ trunk/tp/t/results/xml_tests/raw_and_comments.pl    2018-10-24 13:05:32 UTC 
(rev 8391)
@@ -11,6 +11,26 @@
       'args' => [
         {
           'contents' => [],
+          'extra' => {
+            'comment_at_end' => {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'extra' => {
+                'misc_args' => [
+                  ' comment
+'
+                ]
+              },
+              'parent' => {}
+            }
+          },
           'parent' => {},
           'type' => 'block_line_arg'
         }
@@ -38,6 +58,24 @@
                 }
               ],
               'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' other comment
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'comment',
+                  'extra' => {
+                    'misc_args' => [
+                      ' other comment
+'
+                    ]
+                  },
+                  'parent' => {}
+                },
                 'spaces_after_argument' => '  '
               },
               'parent' => {},
@@ -47,24 +85,6 @@
           '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'
           },
@@ -77,24 +97,6 @@
         }
       ],
       'extra' => {
-        'comment_at_end' => {
-          'args' => [
-            {
-              'parent' => {},
-              'text' => ' comment
-',
-              'type' => 'misc_arg'
-            }
-          ],
-          'cmdname' => 'c',
-          'extra' => {
-            'misc_args' => [
-              ' comment
-'
-            ]
-          },
-          'parent' => {}
-        },
         'end_command' => {},
         'spaces_before_argument' => '  '
       },
@@ -122,6 +124,26 @@
           'args' => [
             {
               'contents' => [],
+              'extra' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' in xml comment
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'extra' => {
+                    'misc_args' => [
+                      ' in xml comment
+'
+                    ]
+                  },
+                  'parent' => {}
+                }
+              },
               'parent' => {},
               'type' => 'block_line_arg'
             }
@@ -149,6 +171,24 @@
                     }
                   ],
                   'extra' => {
+                    'comment_at_end' => {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => ' end xml comment
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'comment',
+                      'extra' => {
+                        'misc_args' => [
+                          ' end xml comment
+'
+                        ]
+                      },
+                      'parent' => {}
+                    },
                     'spaces_after_argument' => '  '
                   },
                   'parent' => {},
@@ -158,24 +198,6 @@
               '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'
               },
@@ -188,24 +210,6 @@
             }
           ],
           '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' => ' '
           },
@@ -223,30 +227,30 @@
   ],
   'type' => 'text_root'
 };
+$result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'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]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'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]{'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]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'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]{'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]