texinfo-commits
[Top][All Lists]
Advanced

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

[7974] save trailing spaces in spaces_after_argument


From: gavinsmith0123
Subject: [7974] save trailing spaces in spaces_after_argument
Date: Thu, 26 Oct 2017 17:36:54 -0400 (EDT)

Revision: 7974
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7974
Author:   gavin
Date:     2017-10-26 17:36:54 -0400 (Thu, 26 Oct 2017)
Log Message:
-----------
save trailing spaces in spaces_after_argument

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/converters_tests/inlinefmtifelse.pl
    trunk/tp/t/results/converters_tests/ref_error_formatting.pl
    trunk/tp/t/results/converters_tests/ref_in_sectioning.pl
    trunk/tp/t/results/coverage_braces/abbr_acronym.pl
    trunk/tp/t/results/coverage_braces/empty_images.pl
    trunk/tp/t/results/coverage_braces/space_in_anchor.pl
    trunk/tp/t/results/coverage_braces/space_in_image.pl
    trunk/tp/t/results/coverage_braces/test_image.pl
    trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl
    trunk/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
    trunk/tp/t/results/sectioning/email_in_node.pl
    trunk/tp/t/results/xml_tests/commands_and_spaces.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-10-26 20:34:46 UTC (rev 7973)
+++ trunk/ChangeLog     2017-10-26 21:36:54 UTC (rev 7974)
@@ -1,5 +1,19 @@
 2017-10-26  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_isolate_last_space): For 
+       'brace_command_arg' only, save trailing spaces in 
+       'spaces_after_argument' extra value instead of adding a 
+       'spaces_at_end' element to the main tree.
+       * tp/Texinfo/Convert/TexinfoXML.pm (_convert),
+       * tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi):
+       Update to look at 'spaces_after_argument' after an argument to
+       a brace command.
+       * tp/Texinfo/Convert/Converter.pm
+       (_collect_leading_trailing_spaces_arg): Check for a
+       'spaces_after_argument' record to find trailing spaces.
+
+2017-10-26  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/TexinfoXML.pm (_leading_spaces_arg): Remove 
        unused.
 

Modified: trunk/tp/Texinfo/Convert/Converter.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Converter.pm       2017-10-26 20:34:46 UTC (rev 
7973)
+++ trunk/tp/Texinfo/Convert/Converter.pm       2017-10-26 21:36:54 UTC (rev 
7974)
@@ -1116,7 +1116,11 @@
     $result[0] = $arg->{'contents'}->[0]->{'text'};
     return @result if (scalar(@{$arg->{'contents'}}) == 1);
   }
-  if ($arg->{'contents'}) {
+
+  if ($arg->{'extra'} and
+      $arg->{'extra'}->{'spaces_after_argument'}) {
+    $result[1] = $arg->{'extra'}->{'spaces_after_argument'};
+  } elsif ($arg->{'contents'}) {
     my $index = -1;
     $index-- if ($arg->{'contents'}->[-1] 
                  and $arg->{'contents'}->[-1]->{'cmdname'}

Modified: trunk/tp/Texinfo/Convert/Texinfo.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Texinfo.pm 2017-10-26 20:34:46 UTC (rev 7973)
+++ trunk/tp/Texinfo/Convert/Texinfo.pm 2017-10-26 21:36:54 UTC (rev 7974)
@@ -162,7 +162,11 @@
       if ($arg->{'extra'} and $arg->{'extra'}->{'spaces_before_argument'}) {
         $result .= $arg->{'extra'}->{'spaces_before_argument'};
       }
-      $result .= convert($arg, $fix) . ',';
+      $result .= convert($arg, $fix);
+      if ($arg->{'extra'} and $arg->{'extra'}->{'spaces_after_argument'}) {
+        $result .= $arg->{'extra'}->{'spaces_after_argument'};
+      }
+      $result .= ',';
     }
     $result =~ s/,$//;
   } elsif ($fix and $misc_commands{$cmdname}
@@ -192,6 +196,9 @@
         $result .= $arg->{'extra'}->{'spaces_before_argument'};
       }
       $result .= convert($arg, $fix);
+      if ($arg->{'extra'} and $arg->{'extra'}->{'spaces_after_argument'}) {
+        $result .= $arg->{'extra'}->{'spaces_after_argument'};
+      }
     }
     if ($cmdname eq 'verb') {
       $result .= $cmd->{'type'};

Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm      2017-10-26 20:34:46 UTC (rev 
7973)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm      2017-10-26 21:36:54 UTC (rev 
7974)
@@ -1177,6 +1177,11 @@
             $in_monospace_not_normal
               if (defined($in_monospace_not_normal));
           my $arg = $self->_convert($root->{'args'}->[$arg_index]);
+          if ($root->{'args'}->[$arg_index]->{'extra'}
+              and 
$root->{'args'}->[$arg_index]->{'extra'}->{'spaces_after_argument'}) {
+            $arg .= $root->{'args'}->[$arg_index]
+                   ->{'extra'}->{'spaces_after_argument'};
+          }
           if (!$Texinfo::Common::context_brace_commands{$root->{'cmdname'}}
               and $root->{'cmdname'} ne 'verb') {
             push @$attribute, 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2017-10-26 20:34:46 UTC (rev 7973)
+++ trunk/tp/Texinfo/Parser.pm  2017-10-26 21:36:54 UTC (rev 7974)
@@ -2223,7 +2223,9 @@
 {
   my ($self, $current, $type) = @_;
 
+  my $end_spaces;
   $type = 'spaces_at_end' if (!defined($type));
+
   if ($current->{'contents'} and @{$current->{'contents'}}) {
     my $index = -1;
     # we ignore space before a misc command that is last on line.
@@ -2236,17 +2238,26 @@
       if (scalar(@{$current->{'contents'}}) > 1 
         and $current->{'contents'}->[-1]->{'cmdname'}
         and 
$self->{'misc_commands'}->{$current->{'contents'}->[-1]->{'cmdname'}});
+
     if (defined($current->{'contents'}->[$index]->{'text'}) 
         and !$current->{'contents'}->[$index]->{'type'}
         and $current->{'contents'}->[$index]->{'text'} =~ /\s+$/) {
       if ($current->{'contents'}->[$index]->{'text'} !~ /\S/) {
-        $current->{'contents'}->[$index]->{'type'} = $type;
+        if ($index == -1 and $current->{'type'} eq 'brace_command_arg') {
+          $end_spaces = $current->{'contents'}->[$index]->{'text'};
+          pop @{$current->{'contents'}};
+          $current->{'extra'}->{'spaces_after_argument'} = $end_spaces;
+        } else {
+          $current->{'contents'}->[$index]->{'type'} = $type;
+        }
       } else {
         $current->{'contents'}->[$index]->{'text'} =~ s/(\s+)$//;
-        my $spaces = $1;
-        my $new_spaces = { 'text' => $spaces, 'parent' => $current,
-                           'type' => $type };
-        if ($index == -1) {
+        $end_spaces = $1;
+        my $new_spaces = { 'text' => $end_spaces, 'parent' => $current,
+          'type' => $type };
+        if ($index == -1 and $current->{'type'} eq 'brace_command_arg') {
+          $current->{'extra'}->{'spaces_after_argument'} = $end_spaces;
+        } elsif ($index == -1) {
           push @{$current->{'contents'}}, $new_spaces;
         } else {
           splice (@{$current->{'contents'}}, $index+1, 0, $new_spaces);

Modified: trunk/tp/t/results/converters_tests/inlinefmtifelse.pl
===================================================================
--- trunk/tp/t/results/converters_tests/inlinefmtifelse.pl      2017-10-26 
20:34:46 UTC (rev 7973)
+++ trunk/tp/t/results/converters_tests/inlinefmtifelse.pl      2017-10-26 
21:36:54 UTC (rev 7974)
@@ -313,14 +313,10 @@
                 {
                   'parent' => {},
                   'text' => 'docbook'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
               'extra' => {
+                'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -391,14 +387,10 @@
                 {
                   'parent' => {},
                   'text' => 'tex'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
               'extra' => {
+                'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -639,7 +631,6 @@
 $result_trees{'inlinefmtifelse'}{'contents'}[4]{'parent'} = 
$result_trees{'inlinefmtifelse'};
 $result_trees{'inlinefmtifelse'}{'contents'}[5]{'parent'} = 
$result_trees{'inlinefmtifelse'};
 
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0];
 
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
 
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
 
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2];
@@ -651,7 +642,6 @@
 $result_trees{'inlinefmtifelse'}{'contents'}[6]{'parent'} = 
$result_trees{'inlinefmtifelse'};
 $result_trees{'inlinefmtifelse'}{'contents'}[7]{'parent'} = 
$result_trees{'inlinefmtifelse'};
 
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0];
 
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
 
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
 
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2];

Modified: trunk/tp/t/results/converters_tests/ref_error_formatting.pl
===================================================================
--- trunk/tp/t/results/converters_tests/ref_error_formatting.pl 2017-10-26 
20:34:46 UTC (rev 7973)
+++ trunk/tp/t/results/converters_tests/ref_error_formatting.pl 2017-10-26 
21:36:54 UTC (rev 7974)
@@ -3144,13 +3144,11 @@
                 {
                   'parent' => {},
                   'text' => 'cross ref name'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
+              'extra' => {
+                'spaces_after_argument' => ' '
+              },
               'parent' => {},
               'type' => 'brace_command_arg'
             }
@@ -4422,7 +4420,6 @@
 $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[1]{'parent'} 
= $result_trees{'ref_error_formatting'}{'contents'}[5];
 
$result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2];
 
$result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2]{'args'}[1];
-$result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2]{'args'}[1];
 
$result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2];
 
$result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2]{'args'}[1]{'contents'}[0];
 $result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[2]{'line_nr'} 
= 
$result_trees{'ref_error_formatting'}{'contents'}[5]{'contents'}[0]{'line_nr'};

Modified: trunk/tp/t/results/converters_tests/ref_in_sectioning.pl
===================================================================
--- trunk/tp/t/results/converters_tests/ref_in_sectioning.pl    2017-10-26 
20:34:46 UTC (rev 7973)
+++ trunk/tp/t/results/converters_tests/ref_in_sectioning.pl    2017-10-26 
21:36:54 UTC (rev 7974)
@@ -1193,14 +1193,10 @@
                     {
                       'parent' => {},
                       'text' => 'Manual'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -1314,14 +1310,10 @@
                     {
                       'parent' => {},
                       'text' => 'Manual'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -1430,14 +1422,10 @@
                     {
                       'parent' => {},
                       'text' => 'Manual'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -1735,14 +1723,10 @@
                     {
                       'parent' => {},
                       'text' => 'Top'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -1763,14 +1747,10 @@
                     {
                       'parent' => {},
                       'text' => 'file name'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -1878,14 +1858,10 @@
                     {
                       'parent' => {},
                       'text' => 'file name'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -2386,7 +2362,6 @@
 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1];
 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1];
 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4];
-$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4];
 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1];
 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[4][0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0];
@@ -2409,7 +2384,6 @@
 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1];
 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1];
 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4];
-$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4];
 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1];
 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[4][0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0];
@@ -2431,7 +2405,6 @@
 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1];
 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1];
 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4];
-$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4];
 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1];
 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[4][0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0];
@@ -2488,12 +2461,10 @@
 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2];
 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2];
 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2];
 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3];
-$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3];
 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2];
 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[3][0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0];
@@ -2516,7 +2487,6 @@
 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2];
 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2];
 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3];
-$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3];
 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2];
 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[3][0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0];

Modified: trunk/tp/t/results/coverage_braces/abbr_acronym.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/abbr_acronym.pl  2017-10-26 20:34:46 UTC 
(rev 7973)
+++ trunk/tp/t/results/coverage_braces/abbr_acronym.pl  2017-10-26 21:36:54 UTC 
(rev 7974)
@@ -280,14 +280,10 @@
                   'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
               'extra' => {
+                'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -455,7 +451,6 @@
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
-$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'parent'}
 = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[0][1]
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1];

Modified: trunk/tp/t/results/coverage_braces/empty_images.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/empty_images.pl  2017-10-26 20:34:46 UTC 
(rev 7973)
+++ trunk/tp/t/results/coverage_braces/empty_images.pl  2017-10-26 21:36:54 UTC 
(rev 7974)
@@ -75,13 +75,11 @@
             {
               'parent' => {},
               'text' => 'cc'
-            },
-            {
-              'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
             }
           ],
+          'extra' => {
+            'spaces_after_argument' => ' '
+          },
           'parent' => {},
           'type' => 'brace_command_arg'
         },
@@ -250,7 +248,6 @@
 
$result_trees{'empty_images'}{'contents'}[3]{'args'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'empty_images'}{'contents'}[3]{'args'}[2];
 $result_trees{'empty_images'}{'contents'}[3]{'args'}[2]{'parent'} = 
$result_trees{'empty_images'}{'contents'}[3];
 
$result_trees{'empty_images'}{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'empty_images'}{'contents'}[3]{'args'}[3];
-$result_trees{'empty_images'}{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'empty_images'}{'contents'}[3]{'args'}[3];
 $result_trees{'empty_images'}{'contents'}[3]{'args'}[3]{'parent'} = 
$result_trees{'empty_images'}{'contents'}[3];
 
$result_trees{'empty_images'}{'contents'}[3]{'args'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'empty_images'}{'contents'}[3]{'args'}[4];
 $result_trees{'empty_images'}{'contents'}[3]{'args'}[4]{'parent'} = 
$result_trees{'empty_images'}{'contents'}[3];

Modified: trunk/tp/t/results/coverage_braces/space_in_anchor.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/space_in_anchor.pl       2017-10-26 
20:34:46 UTC (rev 7973)
+++ trunk/tp/t/results/coverage_braces/space_in_anchor.pl       2017-10-26 
21:36:54 UTC (rev 7974)
@@ -14,14 +14,10 @@
             {
               'parent' => {},
               'text' => 'anchor  name'
-            },
-            {
-              'parent' => {},
-              'text' => '   ',
-              'type' => 'spaces_at_end'
             }
           ],
           'extra' => {
+            'spaces_after_argument' => '   ',
             'spaces_before_argument' => '   '
           },
           'parent' => {},
@@ -63,7 +59,6 @@
   'type' => 'text_root'
 };
 
$result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0];
-$result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0];
 $result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'space_in_anchor'}{'contents'}[0];
 
$result_trees{'space_in_anchor'}{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
 = $result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'space_in_anchor'}{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'space_in_anchor'}{'contents'}[0]{'args'}[0]{'contents'}[0];

Modified: trunk/tp/t/results/coverage_braces/space_in_image.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/space_in_image.pl        2017-10-26 
20:34:46 UTC (rev 7973)
+++ trunk/tp/t/results/coverage_braces/space_in_image.pl        2017-10-26 
21:36:54 UTC (rev 7974)
@@ -14,14 +14,10 @@
             {
               'parent' => {},
               'text' => 'a'
-            },
-            {
-              'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
             }
           ],
           'extra' => {
+            'spaces_after_argument' => ' ',
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -55,13 +51,11 @@
             {
               'parent' => {},
               'text' => 'dd'
-            },
-            {
-              'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
             }
           ],
+          'extra' => {
+            'spaces_after_argument' => ' '
+          },
           'parent' => {},
           'type' => 'brace_command_arg'
         },
@@ -70,13 +64,11 @@
             {
               'parent' => {},
               'text' => 'e'
-            },
-            {
-              'parent' => {},
-              'text' => ' ',
-              'type' => 'spaces_at_end'
             }
           ],
+          'extra' => {
+            'spaces_after_argument' => ' '
+          },
           'parent' => {},
           'type' => 'brace_command_arg'
         }
@@ -122,14 +114,10 @@
                 {
                   'parent' => {},
                   'text' => 'f'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
               'extra' => {
+                'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -160,7 +148,6 @@
   'type' => 'text_root'
 };
 
$result_trees{'space_in_image'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[0];
-$result_trees{'space_in_image'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[0];
 $result_trees{'space_in_image'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'space_in_image'}{'contents'}[0];
 
$result_trees{'space_in_image'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[1];
 $result_trees{'space_in_image'}{'contents'}[0]{'args'}[1]{'parent'} = 
$result_trees{'space_in_image'}{'contents'}[0];
@@ -167,10 +154,8 @@
 
$result_trees{'space_in_image'}{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[2];
 $result_trees{'space_in_image'}{'contents'}[0]{'args'}[2]{'parent'} = 
$result_trees{'space_in_image'}{'contents'}[0];
 
$result_trees{'space_in_image'}{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[3];
-$result_trees{'space_in_image'}{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[3];
 $result_trees{'space_in_image'}{'contents'}[0]{'args'}[3]{'parent'} = 
$result_trees{'space_in_image'}{'contents'}[0];
 
$result_trees{'space_in_image'}{'contents'}[0]{'args'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[4];
-$result_trees{'space_in_image'}{'contents'}[0]{'args'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[4];
 $result_trees{'space_in_image'}{'contents'}[0]{'args'}[4]{'parent'} = 
$result_trees{'space_in_image'}{'contents'}[0];
 
$result_trees{'space_in_image'}{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
 = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_image'}{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
 = $result_trees{'space_in_image'}{'contents'}[0]{'args'}[1]{'contents'}[0];
@@ -180,7 +165,6 @@
 $result_trees{'space_in_image'}{'contents'}[0]{'parent'} = 
$result_trees{'space_in_image'};
 $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'space_in_image'}{'contents'}[1];
 
$result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'line_nr'} = 
$result_trees{'space_in_image'}{'contents'}[0]{'line_nr'};

Modified: trunk/tp/t/results/coverage_braces/test_image.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/test_image.pl    2017-10-26 20:34:46 UTC 
(rev 7973)
+++ trunk/tp/t/results/coverage_braces/test_image.pl    2017-10-26 21:36:54 UTC 
(rev 7974)
@@ -158,13 +158,11 @@
                           },
                           'parent' => {},
                           'type' => ':'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces_at_end'
                         }
                       ],
+                      'extra' => {
+                        'spaces_after_argument' => ' '
+                      },
                       'parent' => {},
                       'type' => 'brace_command_arg'
                     },
@@ -382,13 +380,11 @@
                           },
                           'parent' => {},
                           'type' => ':'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces_at_end'
                         }
                       ],
+                      'extra' => {
+                        'spaces_after_argument' => ' '
+                      },
                       'parent' => {},
                       'type' => 'brace_command_arg'
                     },
@@ -521,14 +517,10 @@
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => '  ',
-                          'type' => 'spaces_at_end'
                         }
                       ],
                       'extra' => {
+                        'spaces_after_argument' => '  ',
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -831,13 +823,11 @@
                   },
                   'parent' => {},
                   'type' => ':'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
+              'extra' => {
+                'spaces_after_argument' => ' '
+              },
               'parent' => {},
               'type' => 'brace_command_arg'
             },
@@ -1051,13 +1041,11 @@
                       },
                       'parent' => {},
                       'type' => ':'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
+                  'extra' => {
+                    'spaces_after_argument' => ' '
+                  },
                   'parent' => {},
                   'type' => 'brace_command_arg'
                 },
@@ -1190,14 +1178,10 @@
                       'line_nr' => {},
                       'parent' => {},
                       'type' => ':'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => '  ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => '  ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -1453,13 +1437,11 @@
                           },
                           'parent' => {},
                           'type' => ':'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces_at_end'
                         }
                       ],
+                      'extra' => {
+                        'spaces_after_argument' => ' '
+                      },
                       'parent' => {},
                       'type' => 'brace_command_arg'
                     },
@@ -1671,13 +1653,11 @@
                           },
                           'parent' => {},
                           'type' => ':'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces_at_end'
                         }
                       ],
+                      'extra' => {
+                        'spaces_after_argument' => ' '
+                      },
                       'parent' => {},
                       'type' => 'brace_command_arg'
                     },
@@ -1810,14 +1790,10 @@
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => '  ',
-                          'type' => 'spaces_at_end'
                         }
                       ],
                       'extra' => {
+                        'spaces_after_argument' => '  ',
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -2123,13 +2099,11 @@
                       },
                       'parent' => {},
                       'type' => ':'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
+                  'extra' => {
+                    'spaces_after_argument' => ' '
+                  },
                   'parent' => {},
                   'type' => 'brace_command_arg'
                 },
@@ -2343,13 +2317,11 @@
                           },
                           'parent' => {},
                           'type' => ':'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'spaces_at_end'
                         }
                       ],
+                      'extra' => {
+                        'spaces_after_argument' => ' '
+                      },
                       'parent' => {},
                       'type' => 'brace_command_arg'
                     },
@@ -2482,14 +2454,10 @@
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => '  ',
-                          'type' => 'spaces_at_end'
                         }
                       ],
                       'extra' => {
+                        'spaces_after_argument' => '  ',
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -2704,13 +2672,11 @@
                               },
                               'parent' => {},
                               'type' => ':'
-                            },
-                            {
-                              'parent' => {},
-                              'text' => ' ',
-                              'type' => 'spaces_at_end'
                             }
                           ],
+                          'extra' => {
+                            'spaces_after_argument' => ' '
+                          },
                           'parent' => {},
                           'type' => 'brace_command_arg'
                         },
@@ -2924,13 +2890,11 @@
                                   },
                                   'parent' => {},
                                   'type' => ':'
-                                },
-                                {
-                                  'parent' => {},
-                                  'text' => ' ',
-                                  'type' => 'spaces_at_end'
                                 }
                               ],
+                              'extra' => {
+                                'spaces_after_argument' => ' '
+                              },
                               'parent' => {},
                               'type' => 'brace_command_arg'
                             },
@@ -3063,14 +3027,10 @@
                                   'line_nr' => {},
                                   'parent' => {},
                                   'type' => ':'
-                                },
-                                {
-                                  'parent' => {},
-                                  'text' => '  ',
-                                  'type' => 'spaces_at_end'
                                 }
                               ],
                               'extra' => {
+                                'spaces_after_argument' => '  ',
                                 'spaces_before_argument' => ' '
                               },
                               'parent' => {},
@@ -3404,7 +3364,6 @@
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
@@ -3465,7 +3424,6 @@
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[1];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
@@ -3494,7 +3452,6 @@
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'};
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3];
-$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[7]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4];
@@ -3578,7 +3535,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'test_image'}{'contents'}[1]{'contents'}[1];
 $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'} 
= $result_trees{'test_image'}{'contents'}[1]{'contents'}[1];
 $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'} 
= $result_trees{'test_image'}{'contents'}[1]{'contents'}[1];
@@ -3638,7 +3594,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
@@ -3667,7 +3622,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[6];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'};
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[6]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[7]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4];
@@ -3740,7 +3694,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[10];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
@@ -3800,7 +3753,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
@@ -3829,7 +3781,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[6];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'};
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[6]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[7]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[3]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[4];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4]{'args'}[4];
@@ -3913,7 +3864,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[10];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[0];
@@ -3973,7 +3923,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1];
@@ -4002,7 +3951,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'};
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[7]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[4];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[3]{'contents'}[1]{'args'}[4];
@@ -4068,7 +4016,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -4128,7 +4075,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1];
@@ -4157,7 +4103,6 @@
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'};
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[7]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4];

Modified: trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl
===================================================================
--- trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl       
2017-10-26 20:34:46 UTC (rev 7973)
+++ trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl       
2017-10-26 21:36:54 UTC (rev 7974)
@@ -281,14 +281,10 @@
                     {
                       'parent' => {},
                       'text' => 'a  node'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -420,14 +416,10 @@
                     {
                       'parent' => {},
                       'text' => 'top'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -1636,7 +1628,6 @@
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
@@ -1659,7 +1650,6 @@
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[5]{'contents'}[4];

Modified: trunk/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
===================================================================
--- trunk/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl   
2017-10-26 20:34:46 UTC (rev 7973)
+++ trunk/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl   
2017-10-26 21:36:54 UTC (rev 7974)
@@ -282,14 +282,10 @@
                       {
                         'parent' => {},
                         'text' => 'a  node'
-                      },
-                      {
-                        'parent' => {},
-                        'text' => ' ',
-                        'type' => 'spaces_at_end'
                       }
                     ],
                     'extra' => {
+                      'spaces_after_argument' => ' ',
                       'spaces_before_argument' => ' '
                     },
                     'parent' => {},
@@ -421,14 +417,10 @@
                       {
                         'parent' => {},
                         'text' => 'top'
-                      },
-                      {
-                        'parent' => {},
-                        'text' => ' ',
-                        'type' => 'spaces_at_end'
                       }
                     ],
                     'extra' => {
+                      'spaces_after_argument' => ' ',
                       'spaces_before_argument' => ' '
                     },
                     'parent' => {},
@@ -1684,7 +1676,6 @@
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0];
@@ -1707,7 +1698,6 @@
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[4];

Modified: trunk/tp/t/results/sectioning/email_in_node.pl
===================================================================
--- trunk/tp/t/results/sectioning/email_in_node.pl      2017-10-26 20:34:46 UTC 
(rev 7973)
+++ trunk/tp/t/results/sectioning/email_in_node.pl      2017-10-26 21:36:54 UTC 
(rev 7974)
@@ -31,14 +31,10 @@
                     {
                       'parent' => {},
                       'text' => 'a'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -72,13 +68,11 @@
                     {
                       'parent' => {},
                       'text' => 'c'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
+                  'extra' => {
+                    'spaces_after_argument' => ' '
+                  },
                   'parent' => {},
                   'type' => 'brace_command_arg'
                 },
@@ -192,13 +186,11 @@
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'email_in_node'}{'contents'}[1];
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3];
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1];
 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'}
 = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3];

Modified: trunk/tp/t/results/xml_tests/commands_and_spaces.pl
===================================================================
--- trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2017-10-26 20:34:46 UTC 
(rev 7973)
+++ trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2017-10-26 21:36:54 UTC 
(rev 7974)
@@ -413,14 +413,10 @@
                 {
                   'parent' => {},
                   'text' => 'a'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
               'extra' => {
+                'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -441,13 +437,11 @@
                 {
                   'parent' => {},
                   'text' => 'c'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
+              'extra' => {
+                'spaces_after_argument' => ' '
+              },
               'parent' => {},
               'type' => 'brace_command_arg'
             },
@@ -469,13 +463,11 @@
                 {
                   'parent' => {},
                   'text' => 'e'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
+              'extra' => {
+                'spaces_after_argument' => ' '
+              },
               'parent' => {},
               'type' => 'brace_command_arg'
             }
@@ -526,14 +518,10 @@
                 {
                   'parent' => {},
                   'text' => 'a'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
               'extra' => {
+                'spaces_after_argument' => ' ',
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -544,14 +532,12 @@
                 {
                   'parent' => {},
                   'text' => 'b'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' 
-',
-                  'type' => 'spaces_at_end'
                 }
               ],
+              'extra' => {
+                'spaces_after_argument' => ' 
+'
+              },
               'parent' => {},
               'type' => 'brace_command_arg'
             },
@@ -560,13 +546,11 @@
                 {
                   'parent' => {},
                   'text' => 'c'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
+              'extra' => {
+                'spaces_after_argument' => ' '
+              },
               'parent' => {},
               'type' => 'brace_command_arg'
             },
@@ -588,13 +572,11 @@
                 {
                   'parent' => {},
                   'text' => 'e'
-                },
-                {
-                  'parent' => {},
-                  'text' => ' ',
-                  'type' => 'spaces_at_end'
                 }
               ],
+              'extra' => {
+                'spaces_after_argument' => ' '
+              },
               'parent' => {},
               'type' => 'brace_command_arg'
             }
@@ -1761,14 +1743,10 @@
                     {
                       'parent' => {},
                       'text' => 'http://ggg'
-                    },
-                    {
-                      'parent' => {},
-                      'text' => ' ',
-                      'type' => 'spaces_at_end'
                     }
                   ],
                   'extra' => {
+                    'spaces_after_argument' => ' ',
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -2211,17 +2189,14 @@
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[13]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[14]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[1]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[2];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[2];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[2]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[3];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[3]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[4];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[4];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[4]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[0];
@@ -2232,18 +2207,14 @@
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[16]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[17]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[1]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[2];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[2];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[2]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[3];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[3]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[4];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[4];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[4]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0];
@@ -2461,7 +2432,6 @@
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[41]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42];




reply via email to

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