[7068] line number and contents for accent commands

[Gavin D. Smith]

Revision: 7068
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7068
Author:   gavin
Date:     2016-03-28 10:06:23 +0000 (Mon, 28 Mar 2016)
Log Message:
-----------
line number and contents for accent commands

Modified Paths:
--------------
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/converters_tests/accent.pl
    trunk/tp/t/results/converters_tests/accent_with_text.pl
    trunk/tp/t/results/converters_tests/accentenc.pl
    trunk/tp/t/results/converters_tests/accentenc_enable_encoding.pl
    trunk/tp/t/results/converters_tests/accentenc_no_entity.pl
    trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
    trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl
    
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
    trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl
    trunk/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl
    trunk/tp/t/results/converters_tests/empty_accent.pl
    trunk/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl
    trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
    trunk/tp/t/results/converters_tests/weird_accents.pl
    trunk/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
    trunk/tp/t/results/coverage/accent_and_dash.pl
    trunk/tp/t/results/coverage/accent_no_closed.pl
    trunk/tp/t/results/coverage/accent_no_closed_comment.pl
    trunk/tp/t/results/coverage/accent_no_closed_newline.pl
    trunk/tp/t/results/coverage/accent_no_closed_paragraph.pl
    trunk/tp/t/results/coverage/accents_errors.pl
    trunk/tp/t/results/coverage/at_after_accent_command.pl
    trunk/tp/t/results/coverage/commands.pl
    trunk/tp/t/results/coverage/lettered_accent_and_spaces.pl
    trunk/tp/t/results/coverage/not_i_j_in_dotless.pl
    trunk/tp/t/results/coverage/quotation_author.pl
    trunk/tp/t/results/coverage/test_errormsg.pl
    trunk/tp/t/results/coverage/unknown_accents.pl
    trunk/tp/t/results/coverage_braces/abbr_acronym.pl
    trunk/tp/t/results/coverage_braces/empty_commands.pl
    trunk/tp/t/results/coverage_braces/nested_args.pl
    trunk/tp/t/results/coverage_braces/nested_in_sc.pl
    trunk/tp/t/results/coverage_braces/test_image.pl
    trunk/tp/t/results/float/complex_float.pl
    trunk/tp/t/results/float/float_with_at_commands.pl
    trunk/tp/t/results/float/listoffloats_with_commands.pl
    trunk/tp/t/results/float/numbering_captions_listoffloats.pl
    trunk/tp/t/results/html_tests/documentdescription.pl
    trunk/tp/t/results/html_tests/no_use_iso.pl
    trunk/tp/t/results/html_tests/redirection_same_labels.pl
    trunk/tp/t/results/html_tests/utf8_enable_encoding.pl
    trunk/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
    trunk/tp/t/results/html_tests/utf8_no_use_entity.pl
    trunk/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding.pl
    
trunk/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl
    trunk/tp/t/results/html_tests/utf8_no_use_entity_no_use_iso.pl
    trunk/tp/t/results/indices/def_syn_indices.pl
    trunk/tp/t/results/indices/encoding_index_ascii.pl
    trunk/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
    trunk/tp/t/results/indices/encoding_index_latin1.pl
    trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
    trunk/tp/t/results/indices/encoding_index_utf8.pl
    trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
    trunk/tp/t/results/invalid_nestings/accents.pl
    trunk/tp/t/results/itemize/accent_argument.pl
    trunk/tp/t/results/macro/macro_in_accent.pl
    trunk/tp/t/results/macro/macro_in_index_commands.pl
    trunk/tp/t/results/misc_commands/invalid_documentencoding.pl
    trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
    trunk/tp/t/results/paragraph/paragraph_command.pl
    trunk/tp/t/results/plaintext_tests/accent_command_punctuation.pl
    trunk/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
    trunk/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
    trunk/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
    trunk/tp/t/results/plaintext_tests/before_accent_punctuation.pl
    trunk/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
    trunk/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
    trunk/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
    
trunk/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
    trunk/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
    
trunk/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
    trunk/tp/t/results/sectioning/at_commands_in_node.pl
    trunk/tp/t/results/sectioning/node.pl
    trunk/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
    trunk/tp/t/results/test_count/commands.pl
    trunk/tp/t/results/value/value_after_accent.pl
    trunk/tp/t/results/value/value_in_index_commands.pl
    trunk/tp/t/results/xtable/accent_on_table_line.pl

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/Texinfo/Parser.pm  2016-03-28 10:06:23 UTC (rev 7068)
@@ -278,6 +278,9 @@
   $keep_line_nr_brace_commands{$brace_command} = 1
     if ($brace_commands{$brace_command} > 1);
 }
+foreach my $brace_command (keys (%accent_commands)) {
+  $keep_line_nr_brace_commands{$brace_command} = 1;
+}
 
 my %type_with_paragraph;
 foreach my $type ('before_item', 'text_root', 'document_root',
@@ -4198,7 +4201,6 @@
             if ($current->{'cmdname'} =~ /^[a-zA-Z]/) {
               $current->{'args'}->[-1]->{'type'} = 'space_command_arg';
             }
-            delete $current->{'contents'};
             $current = $current->{'parent'};
           } else { # The accent is at end of line
             # whitespace for commands with letter.
@@ -5042,8 +5044,10 @@
                or defined($self->{'definfoenclose'}->{$command})) {
           
           push @{$current->{'contents'}}, { 'cmdname' => $command, 
-                                            'parent' => $current, 
-                                            'contents' => [] };
+                                            'parent' => $current };
+          if (not $accent_commands{$command}) {
+            $current->{'contents'}->[-1]->{'contents'} = [];
+          }
           $current->{'contents'}->[-1]->{'line_nr'} = $line_nr
             if ($keep_line_nr_brace_commands{$command});
           _mark_and_warn_invalid($self, $command, $invalid_parent,

Modified: trunk/tp/t/results/converters_tests/accent.pl
===================================================================
--- trunk/tp/t/results/converters_tests/accent.pl       2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/converters_tests/accent.pl       2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -116,7 +116,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -142,6 +141,7 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -179,7 +179,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -205,6 +204,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -242,7 +242,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -268,6 +267,7 @@
                 }
               ],
               'cmdname' => '^',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -305,7 +305,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -331,6 +330,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -368,7 +368,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -394,6 +393,7 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -431,7 +431,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -457,6 +456,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -494,7 +494,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -520,6 +519,7 @@
                 }
               ],
               'cmdname' => '^',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -557,7 +557,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -583,6 +582,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -620,7 +620,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -646,6 +645,7 @@
                 }
               ],
               'cmdname' => ',',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -683,7 +683,6 @@
                 }
               ],
               'cmdname' => '~',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -709,6 +708,7 @@
                 }
               ],
               'cmdname' => '~',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -746,7 +746,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -772,6 +771,7 @@
                 }
               ],
               'cmdname' => '=',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -835,7 +835,6 @@
                 }
               ],
               'cmdname' => 'H',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -860,6 +859,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -897,7 +897,6 @@
                 }
               ],
               'cmdname' => 'dotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -926,6 +925,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -963,7 +963,6 @@
                 }
               ],
               'cmdname' => 'ringaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -992,6 +991,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1029,7 +1029,6 @@
                 }
               ],
               'cmdname' => 'tieaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -1072,7 +1071,6 @@
                 }
               ],
               'cmdname' => 'u',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -1101,6 +1099,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1138,7 +1137,6 @@
                 }
               ],
               'cmdname' => 'ubaraccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -1167,6 +1165,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1204,7 +1203,6 @@
                 }
               ],
               'cmdname' => 'udotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -1233,6 +1231,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1270,7 +1269,6 @@
                 }
               ],
               'cmdname' => 'v',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 40,
@@ -1299,6 +1297,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1336,7 +1335,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 42,
@@ -1365,6 +1363,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1402,7 +1401,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1431,6 +1429,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1647,7 +1646,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 52,
@@ -1673,7 +1671,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -1898,7 +1895,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 63,
@@ -1912,7 +1908,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -1955,7 +1950,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 65,
@@ -1969,7 +1963,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2012,7 +2005,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 67,
@@ -2026,7 +2018,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2069,7 +2060,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 69,
@@ -2083,7 +2073,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2144,7 +2133,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 72,
@@ -2158,7 +2146,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2201,7 +2188,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 74,
@@ -2215,7 +2201,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2258,7 +2243,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 76,
@@ -2272,7 +2256,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2315,7 +2298,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 78,
@@ -2329,7 +2311,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2383,6 +2364,7 @@
 $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'};
 $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[1];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[1];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2394,6 +2376,7 @@
 $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'line_nr'};
 $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[3];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[3];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2405,6 +2388,7 @@
 $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'line_nr'};
 $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[5];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[5];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2416,6 +2400,7 @@
 $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'line_nr'};
 $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[7];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[7];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2427,6 +2412,7 @@
 $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'line_nr'};
 $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[9];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[9];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2438,6 +2424,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[11];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[11]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2449,6 +2436,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[13];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[13]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2460,6 +2448,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[15];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[15]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2471,6 +2460,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[17];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[17]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2482,6 +2472,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[19];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[19];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[19];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[19]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2493,6 +2484,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[21];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[21]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2509,6 +2501,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[23];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[23];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'contents'}[6]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[23];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[23]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2520,6 +2513,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[25];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[25]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2531,6 +2525,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[27];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[27]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2549,6 +2544,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[31];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[31];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[31];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[31]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2560,6 +2556,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[33];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[33]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2571,6 +2568,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[35];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[35];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[35];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[35]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2582,6 +2580,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[37];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[37];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[37];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[37]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2593,6 +2592,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[39];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[39]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];
@@ -2604,6 +2604,7 @@
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[2]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3];
+$result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'line_nr'};
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'contents'}[4]{'parent'} 
= $result_trees{'accent'}{'contents'}[2]{'contents'}[41];
 $result_trees{'accent'}{'contents'}[2]{'contents'}[41]{'parent'} = 
$result_trees{'accent'}{'contents'}[2];

Modified: trunk/tp/t/results/converters_tests/accent_with_text.pl
===================================================================
--- trunk/tp/t/results/converters_tests/accent_with_text.pl     2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/accent_with_text.pl     2016-03-28 
10:06:23 UTC (rev 7068)
@@ -23,7 +23,6 @@
             }
           ],
           'cmdname' => 'u',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 1,
@@ -49,7 +48,6 @@
             }
           ],
           'cmdname' => 'dotless',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -79,7 +77,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 }
@@ -89,7 +86,6 @@
             }
           ],
           'cmdname' => '^',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -119,7 +115,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 }
@@ -129,7 +124,6 @@
             }
           ],
           'cmdname' => '^',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -151,7 +145,6 @@
             }
           ],
           'cmdname' => '^',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },

Modified: trunk/tp/t/results/converters_tests/accentenc.pl
===================================================================
--- trunk/tp/t/results/converters_tests/accentenc.pl    2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/converters_tests/accentenc.pl    2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -164,7 +164,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -190,6 +189,7 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -227,7 +227,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -253,6 +252,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -290,7 +290,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -316,6 +315,7 @@
                 }
               ],
               'cmdname' => '^',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -353,7 +353,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -379,6 +378,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -416,7 +416,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -442,6 +441,7 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -479,7 +479,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -505,6 +504,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -542,7 +542,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -568,6 +567,7 @@
                 }
               ],
               'cmdname' => '^',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -605,7 +605,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -631,6 +630,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -668,7 +668,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -694,6 +693,7 @@
                 }
               ],
               'cmdname' => ',',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -731,7 +731,6 @@
                 }
               ],
               'cmdname' => '~',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -757,6 +756,7 @@
                 }
               ],
               'cmdname' => '~',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -794,7 +794,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -820,6 +819,7 @@
                 }
               ],
               'cmdname' => '=',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -883,7 +883,6 @@
                 }
               ],
               'cmdname' => 'H',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -908,6 +907,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -945,7 +945,6 @@
                 }
               ],
               'cmdname' => 'dotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -974,6 +973,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1011,7 +1011,6 @@
                 }
               ],
               'cmdname' => 'ringaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -1040,6 +1039,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1077,7 +1077,6 @@
                 }
               ],
               'cmdname' => 'tieaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -1120,7 +1119,6 @@
                 }
               ],
               'cmdname' => 'u',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -1149,6 +1147,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1186,7 +1185,6 @@
                 }
               ],
               'cmdname' => 'ubaraccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -1215,6 +1213,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1252,7 +1251,6 @@
                 }
               ],
               'cmdname' => 'udotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 40,
@@ -1281,6 +1279,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1318,7 +1317,6 @@
                 }
               ],
               'cmdname' => 'v',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 42,
@@ -1347,6 +1345,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1384,7 +1383,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1413,6 +1411,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1450,7 +1449,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 46,
@@ -1479,6 +1477,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1695,7 +1694,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 54,
@@ -1721,7 +1719,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -1946,7 +1943,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 65,
@@ -1960,7 +1956,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2003,7 +1998,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 67,
@@ -2017,7 +2011,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2060,7 +2053,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 69,
@@ -2074,7 +2066,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2117,7 +2108,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 71,
@@ -2131,7 +2121,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2192,7 +2181,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 74,
@@ -2206,7 +2194,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2249,7 +2236,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 76,
@@ -2263,7 +2249,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2306,7 +2291,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 78,
@@ -2320,7 +2304,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2363,7 +2346,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 80,
@@ -2377,7 +2359,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2439,6 +2420,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2450,6 +2432,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2461,6 +2444,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2472,6 +2456,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2483,6 +2468,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2494,6 +2480,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[11]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2505,6 +2492,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[13]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2516,6 +2504,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[15]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2527,6 +2516,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[17]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2538,6 +2528,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[19]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2549,6 +2540,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[21]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2565,6 +2557,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'contents'}[6]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[23]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2576,6 +2569,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[25]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2587,6 +2581,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[27]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2605,6 +2600,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[31]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2616,6 +2612,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[33]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2627,6 +2624,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[35]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2638,6 +2636,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[37]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2649,6 +2648,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[39]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];
@@ -2660,6 +2660,7 @@
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3];
+$result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41];
 $result_trees{'accentenc'}{'contents'}[2]{'contents'}[41]{'parent'} = 
$result_trees{'accentenc'}{'contents'}[2];

Modified: trunk/tp/t/results/converters_tests/accentenc_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/converters_tests/accentenc_enable_encoding.pl    
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/accentenc_enable_encoding.pl    
2016-03-28 10:06:23 UTC (rev 7068)
@@ -164,7 +164,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -190,6 +189,7 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -227,7 +227,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -253,6 +252,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -290,7 +290,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -316,6 +315,7 @@
                 }
               ],
               'cmdname' => '^',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -353,7 +353,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -379,6 +378,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -416,7 +416,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -442,6 +441,7 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -479,7 +479,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -505,6 +504,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -542,7 +542,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -568,6 +567,7 @@
                 }
               ],
               'cmdname' => '^',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -605,7 +605,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -631,6 +630,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -668,7 +668,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -694,6 +693,7 @@
                 }
               ],
               'cmdname' => ',',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -731,7 +731,6 @@
                 }
               ],
               'cmdname' => '~',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -757,6 +756,7 @@
                 }
               ],
               'cmdname' => '~',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -794,7 +794,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -820,6 +819,7 @@
                 }
               ],
               'cmdname' => '=',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -883,7 +883,6 @@
                 }
               ],
               'cmdname' => 'H',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -908,6 +907,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -945,7 +945,6 @@
                 }
               ],
               'cmdname' => 'dotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -974,6 +973,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1011,7 +1011,6 @@
                 }
               ],
               'cmdname' => 'ringaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -1040,6 +1039,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1077,7 +1077,6 @@
                 }
               ],
               'cmdname' => 'tieaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -1120,7 +1119,6 @@
                 }
               ],
               'cmdname' => 'u',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -1149,6 +1147,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1186,7 +1185,6 @@
                 }
               ],
               'cmdname' => 'ubaraccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -1215,6 +1213,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1252,7 +1251,6 @@
                 }
               ],
               'cmdname' => 'udotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 40,
@@ -1281,6 +1279,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1318,7 +1317,6 @@
                 }
               ],
               'cmdname' => 'v',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 42,
@@ -1347,6 +1345,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1384,7 +1383,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1413,6 +1411,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1450,7 +1449,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 46,
@@ -1479,6 +1477,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1695,7 +1694,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 54,
@@ -1721,7 +1719,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -1946,7 +1943,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 65,
@@ -1960,7 +1956,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2003,7 +1998,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 67,
@@ -2017,7 +2011,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2060,7 +2053,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 69,
@@ -2074,7 +2066,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2117,7 +2108,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 71,
@@ -2131,7 +2121,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2192,7 +2181,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 74,
@@ -2206,7 +2194,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2249,7 +2236,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 76,
@@ -2263,7 +2249,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2306,7 +2291,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 78,
@@ -2320,7 +2304,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2363,7 +2346,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 80,
@@ -2377,7 +2359,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2439,6 +2420,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2450,6 +2432,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2461,6 +2444,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2472,6 +2456,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2483,6 +2468,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[9]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2494,6 +2480,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[11]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2505,6 +2492,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[13]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2516,6 +2504,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[15]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2527,6 +2516,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[17]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2538,6 +2528,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[19]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2549,6 +2540,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[21]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2565,6 +2557,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'contents'}[6]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[23]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2576,6 +2569,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[25]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2587,6 +2581,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[27]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2605,6 +2600,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[31]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2616,6 +2612,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[33]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2627,6 +2624,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[35]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2638,6 +2636,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[37]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2649,6 +2648,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[39]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];
@@ -2660,6 +2660,7 @@
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3];
+$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[2]{'contents'}[41]{'parent'}
 = $result_trees{'accentenc_enable_encoding'}{'contents'}[2];

Modified: trunk/tp/t/results/converters_tests/accentenc_no_entity.pl
===================================================================
--- trunk/tp/t/results/converters_tests/accentenc_no_entity.pl  2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/accentenc_no_entity.pl  2016-03-28 
10:06:23 UTC (rev 7068)
@@ -164,7 +164,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -190,6 +189,7 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -227,7 +227,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -253,6 +252,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -290,7 +290,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -316,6 +315,7 @@
                 }
               ],
               'cmdname' => '^',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -353,7 +353,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -379,6 +378,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -416,7 +416,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -442,6 +441,7 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -479,7 +479,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -505,6 +504,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -542,7 +542,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -568,6 +567,7 @@
                 }
               ],
               'cmdname' => '^',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -605,7 +605,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -631,6 +630,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -668,7 +668,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -694,6 +693,7 @@
                 }
               ],
               'cmdname' => ',',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -731,7 +731,6 @@
                 }
               ],
               'cmdname' => '~',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -757,6 +756,7 @@
                 }
               ],
               'cmdname' => '~',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -794,7 +794,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -820,6 +819,7 @@
                 }
               ],
               'cmdname' => '=',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -883,7 +883,6 @@
                 }
               ],
               'cmdname' => 'H',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -908,6 +907,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -945,7 +945,6 @@
                 }
               ],
               'cmdname' => 'dotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -974,6 +973,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1011,7 +1011,6 @@
                 }
               ],
               'cmdname' => 'ringaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -1040,6 +1039,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1077,7 +1077,6 @@
                 }
               ],
               'cmdname' => 'tieaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -1120,7 +1119,6 @@
                 }
               ],
               'cmdname' => 'u',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -1149,6 +1147,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1186,7 +1185,6 @@
                 }
               ],
               'cmdname' => 'ubaraccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -1215,6 +1213,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1252,7 +1251,6 @@
                 }
               ],
               'cmdname' => 'udotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 40,
@@ -1281,6 +1279,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1318,7 +1317,6 @@
                 }
               ],
               'cmdname' => 'v',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 42,
@@ -1347,6 +1345,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1384,7 +1383,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 44,
@@ -1413,6 +1411,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1450,7 +1449,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 46,
@@ -1479,6 +1477,7 @@
               'extra' => {
                 'spaces' => ' '
               },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -1695,7 +1694,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 54,
@@ -1721,7 +1719,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -1946,7 +1943,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 65,
@@ -1960,7 +1956,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2003,7 +1998,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 67,
@@ -2017,7 +2011,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2060,7 +2053,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 69,
@@ -2074,7 +2066,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2117,7 +2108,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 71,
@@ -2131,7 +2121,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2192,7 +2181,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 74,
@@ -2206,7 +2194,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2249,7 +2236,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 76,
@@ -2263,7 +2249,6 @@
                 }
               ],
               'cmdname' => '\'',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2306,7 +2291,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 78,
@@ -2320,7 +2304,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2363,7 +2346,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 80,
@@ -2377,7 +2359,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -2439,6 +2420,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2450,6 +2432,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2461,6 +2444,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2472,6 +2456,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2483,6 +2468,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2494,6 +2480,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[11]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2505,6 +2492,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[13]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2516,6 +2504,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[15]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2527,6 +2516,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[17]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2538,6 +2528,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[19]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2549,6 +2540,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[21]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2565,6 +2557,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[5]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'contents'}[6]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[23]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2576,6 +2569,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[25]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2587,6 +2581,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[27]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2605,6 +2600,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[31]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2616,6 +2612,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[33]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2627,6 +2624,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[35]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2638,6 +2636,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[37]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2649,6 +2648,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[39]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];
@@ -2660,6 +2660,7 @@
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[2]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3];
+$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[1]{'line_nr'};
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[3]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41];
 
$result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'contents'}[4]{'parent'}
 = $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41];
 $result_trees{'accentenc_no_entity'}{'contents'}[2]{'contents'}[41]{'parent'} 
= $result_trees{'accentenc_no_entity'}{'contents'}[2];

Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs.pl  2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs.pl  2016-03-28 
10:06:23 UTC (rev 7068)
@@ -1520,7 +1520,6 @@
                         }
                       ],
                       'cmdname' => '"',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 14,
@@ -1546,7 +1545,6 @@
                         }
                       ],
                       'cmdname' => '~',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1572,7 +1570,6 @@
                                 }
                               ],
                               'cmdname' => 'dotless',
-                              'contents' => [],
                               'line_nr' => {},
                               'parent' => {}
                             }
@@ -1582,7 +1579,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1604,7 +1600,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1626,7 +1621,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1648,6 +1642,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -1668,7 +1663,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1690,7 +1684,6 @@
                         }
                       ],
                       'cmdname' => '=',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1712,7 +1705,6 @@
                         }
                       ],
                       'cmdname' => 'ringaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1734,7 +1726,6 @@
                         }
                       ],
                       'cmdname' => 'H',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1756,7 +1747,6 @@
                         }
                       ],
                       'cmdname' => 'ogonek',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -1843,7 +1833,6 @@
                         }
                       ],
                       'cmdname' => 'dotaccent',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 15,
@@ -1869,7 +1858,6 @@
                         }
                       ],
                       'cmdname' => 'u',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1891,7 +1879,6 @@
                         }
                       ],
                       'cmdname' => 'ubaraccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1913,7 +1900,6 @@
                         }
                       ],
                       'cmdname' => 'udotaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1935,7 +1921,6 @@
                         }
                       ],
                       'cmdname' => 'v',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1957,7 +1942,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1979,7 +1963,6 @@
                         }
                       ],
                       'cmdname' => 'tieaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -2058,7 +2041,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 16,
@@ -2088,6 +2070,7 @@
                                 }
                               ],
                               'cmdname' => '=',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -2096,7 +2079,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2122,6 +2104,7 @@
                                 }
                               ],
                               'cmdname' => '\'',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -2130,7 +2113,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -7126,7 +7108,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 61,
@@ -7152,7 +7133,6 @@
                 }
               ],
               'cmdname' => '~',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7178,7 +7158,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -7188,7 +7167,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7210,7 +7188,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7232,7 +7209,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7254,6 +7230,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -7274,7 +7251,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7296,7 +7272,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7318,7 +7293,6 @@
                 }
               ],
               'cmdname' => 'ringaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7340,7 +7314,6 @@
                 }
               ],
               'cmdname' => 'H',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7362,7 +7335,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7441,7 +7413,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 62,
@@ -7467,7 +7438,6 @@
                 }
               ],
               'cmdname' => '~',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7493,7 +7463,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -7503,7 +7472,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7525,7 +7493,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7547,7 +7514,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7569,6 +7535,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -7589,7 +7556,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7611,7 +7577,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7633,7 +7598,6 @@
                 }
               ],
               'cmdname' => 'ringaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7655,7 +7619,6 @@
                 }
               ],
               'cmdname' => 'H',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7677,7 +7640,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7758,7 +7720,6 @@
                 }
               ],
               'cmdname' => 'dotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 64,
@@ -7784,7 +7745,6 @@
                 }
               ],
               'cmdname' => 'u',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7806,7 +7766,6 @@
                 }
               ],
               'cmdname' => 'ubaraccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7828,7 +7787,6 @@
                 }
               ],
               'cmdname' => 'udotaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7850,7 +7808,6 @@
                 }
               ],
               'cmdname' => 'v',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7872,7 +7829,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7894,7 +7850,6 @@
                 }
               ],
               'cmdname' => 'tieaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7965,7 +7920,6 @@
                 }
               ],
               'cmdname' => 'dotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 65,
@@ -7991,7 +7945,6 @@
                 }
               ],
               'cmdname' => 'u',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8013,7 +7966,6 @@
                 }
               ],
               'cmdname' => 'ubaraccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8035,7 +7987,6 @@
                 }
               ],
               'cmdname' => 'udotaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8057,7 +8008,6 @@
                 }
               ],
               'cmdname' => 'v',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8079,7 +8029,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8101,7 +8050,6 @@
                 }
               ],
               'cmdname' => 'tieaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8174,7 +8122,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 67,
@@ -8204,6 +8151,7 @@
                         }
                       ],
                       'cmdname' => '=',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8212,7 +8160,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8238,6 +8185,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8246,7 +8194,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8309,7 +8256,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 68,
@@ -8339,6 +8285,7 @@
                         }
                       ],
                       'cmdname' => '=',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8347,7 +8294,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8373,6 +8319,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8381,7 +8328,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -14029,7 +13975,6 @@
                         }
                       ],
                       'cmdname' => '"',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 133,
@@ -14055,7 +14000,6 @@
                         }
                       ],
                       'cmdname' => '~',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14081,7 +14025,6 @@
                                 }
                               ],
                               'cmdname' => 'dotless',
-                              'contents' => [],
                               'line_nr' => {},
                               'parent' => {}
                             }
@@ -14091,7 +14034,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14113,7 +14055,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14135,7 +14076,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14157,6 +14097,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -14177,7 +14118,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14199,7 +14139,6 @@
                         }
                       ],
                       'cmdname' => '=',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14221,7 +14160,6 @@
                         }
                       ],
                       'cmdname' => 'ringaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14243,7 +14181,6 @@
                         }
                       ],
                       'cmdname' => 'H',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14265,7 +14202,6 @@
                         }
                       ],
                       'cmdname' => 'ogonek',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -14360,7 +14296,6 @@
                         }
                       ],
                       'cmdname' => 'dotaccent',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 134,
@@ -14386,7 +14321,6 @@
                         }
                       ],
                       'cmdname' => 'u',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14408,7 +14342,6 @@
                         }
                       ],
                       'cmdname' => 'ubaraccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14430,7 +14363,6 @@
                         }
                       ],
                       'cmdname' => 'udotaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14452,7 +14384,6 @@
                         }
                       ],
                       'cmdname' => 'v',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14474,7 +14405,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14496,7 +14426,6 @@
                         }
                       ],
                       'cmdname' => 'tieaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -14575,7 +14504,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 135,
@@ -14605,6 +14533,7 @@
                                 }
                               ],
                               'cmdname' => '=',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -14613,7 +14542,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14639,6 +14567,7 @@
                                 }
                               ],
                               'cmdname' => '\'',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -14647,7 +14576,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -17206,6 +17134,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[9]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[11]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[12]{'args'}[0];
@@ -17323,6 +17252,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
@@ -17330,6 +17260,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
@@ -18524,6 +18455,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[13]{'args'}[0];
@@ -18608,6 +18540,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[22]{'args'}[0]{'contents'}[13]{'args'}[0];
@@ -18777,6 +18710,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -18784,6 +18718,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -18807,6 +18742,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -18814,6 +18750,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5];
 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -20186,6 +20123,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0];
@@ -20329,6 +20267,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
@@ -20336,6 +20275,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};

Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl   
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl   
2016-03-28 10:06:23 UTC (rev 7068)
@@ -1607,7 +1607,6 @@
                         }
                       ],
                       'cmdname' => '"',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 17,
@@ -1633,7 +1632,6 @@
                         }
                       ],
                       'cmdname' => '~',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1659,7 +1657,6 @@
                                 }
                               ],
                               'cmdname' => 'dotless',
-                              'contents' => [],
                               'line_nr' => {},
                               'parent' => {}
                             }
@@ -1669,7 +1666,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1691,7 +1687,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1713,7 +1708,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1735,6 +1729,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -1755,7 +1750,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1777,7 +1771,6 @@
                         }
                       ],
                       'cmdname' => '=',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1799,7 +1792,6 @@
                         }
                       ],
                       'cmdname' => 'ringaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1821,7 +1813,6 @@
                         }
                       ],
                       'cmdname' => 'H',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1843,7 +1834,6 @@
                         }
                       ],
                       'cmdname' => 'ogonek',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -1930,7 +1920,6 @@
                         }
                       ],
                       'cmdname' => 'dotaccent',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 18,
@@ -1956,7 +1945,6 @@
                         }
                       ],
                       'cmdname' => 'u',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1978,7 +1966,6 @@
                         }
                       ],
                       'cmdname' => 'ubaraccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2000,7 +1987,6 @@
                         }
                       ],
                       'cmdname' => 'udotaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2022,7 +2008,6 @@
                         }
                       ],
                       'cmdname' => 'v',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2044,7 +2029,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2066,7 +2050,6 @@
                         }
                       ],
                       'cmdname' => 'tieaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -2145,7 +2128,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 19,
@@ -2175,6 +2157,7 @@
                                 }
                               ],
                               'cmdname' => '=',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -2183,7 +2166,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2209,6 +2191,7 @@
                                 }
                               ],
                               'cmdname' => '\'',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -2217,7 +2200,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -7213,7 +7195,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 64,
@@ -7239,7 +7220,6 @@
                 }
               ],
               'cmdname' => '~',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7265,7 +7245,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -7275,7 +7254,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7297,7 +7275,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7319,7 +7296,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7341,6 +7317,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -7361,7 +7338,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7383,7 +7359,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7405,7 +7380,6 @@
                 }
               ],
               'cmdname' => 'ringaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7427,7 +7401,6 @@
                 }
               ],
               'cmdname' => 'H',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7449,7 +7422,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7528,7 +7500,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 65,
@@ -7554,7 +7525,6 @@
                 }
               ],
               'cmdname' => '~',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7580,7 +7550,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -7590,7 +7559,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7612,7 +7580,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7634,7 +7601,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7656,6 +7622,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -7676,7 +7643,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7698,7 +7664,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7720,7 +7685,6 @@
                 }
               ],
               'cmdname' => 'ringaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7742,7 +7706,6 @@
                 }
               ],
               'cmdname' => 'H',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7764,7 +7727,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7845,7 +7807,6 @@
                 }
               ],
               'cmdname' => 'dotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 67,
@@ -7871,7 +7832,6 @@
                 }
               ],
               'cmdname' => 'u',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7893,7 +7853,6 @@
                 }
               ],
               'cmdname' => 'ubaraccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7915,7 +7874,6 @@
                 }
               ],
               'cmdname' => 'udotaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7937,7 +7895,6 @@
                 }
               ],
               'cmdname' => 'v',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7959,7 +7916,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7981,7 +7937,6 @@
                 }
               ],
               'cmdname' => 'tieaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8052,7 +8007,6 @@
                 }
               ],
               'cmdname' => 'dotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 68,
@@ -8078,7 +8032,6 @@
                 }
               ],
               'cmdname' => 'u',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8100,7 +8053,6 @@
                 }
               ],
               'cmdname' => 'ubaraccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8122,7 +8074,6 @@
                 }
               ],
               'cmdname' => 'udotaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8144,7 +8095,6 @@
                 }
               ],
               'cmdname' => 'v',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8166,7 +8116,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8188,7 +8137,6 @@
                 }
               ],
               'cmdname' => 'tieaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8261,7 +8209,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 70,
@@ -8291,6 +8238,7 @@
                         }
                       ],
                       'cmdname' => '=',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8299,7 +8247,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8325,6 +8272,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8333,7 +8281,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8396,7 +8343,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 71,
@@ -8426,6 +8372,7 @@
                         }
                       ],
                       'cmdname' => '=',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8434,7 +8381,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8460,6 +8406,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8468,7 +8415,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -14116,7 +14062,6 @@
                         }
                       ],
                       'cmdname' => '"',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 136,
@@ -14142,7 +14087,6 @@
                         }
                       ],
                       'cmdname' => '~',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14168,7 +14112,6 @@
                                 }
                               ],
                               'cmdname' => 'dotless',
-                              'contents' => [],
                               'line_nr' => {},
                               'parent' => {}
                             }
@@ -14178,7 +14121,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14200,7 +14142,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14222,7 +14163,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14244,6 +14184,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -14264,7 +14205,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14286,7 +14226,6 @@
                         }
                       ],
                       'cmdname' => '=',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14308,7 +14247,6 @@
                         }
                       ],
                       'cmdname' => 'ringaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14330,7 +14268,6 @@
                         }
                       ],
                       'cmdname' => 'H',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14352,7 +14289,6 @@
                         }
                       ],
                       'cmdname' => 'ogonek',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -14447,7 +14383,6 @@
                         }
                       ],
                       'cmdname' => 'dotaccent',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 137,
@@ -14473,7 +14408,6 @@
                         }
                       ],
                       'cmdname' => 'u',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14495,7 +14429,6 @@
                         }
                       ],
                       'cmdname' => 'ubaraccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14517,7 +14450,6 @@
                         }
                       ],
                       'cmdname' => 'udotaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14539,7 +14471,6 @@
                         }
                       ],
                       'cmdname' => 'v',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14561,7 +14492,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14583,7 +14513,6 @@
                         }
                       ],
                       'cmdname' => 'tieaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -14662,7 +14591,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 138,
@@ -14692,6 +14620,7 @@
                                 }
                               ],
                               'cmdname' => '=',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -14700,7 +14629,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14726,6 +14654,7 @@
                                 }
                               ],
                               'cmdname' => '\'',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -14734,7 +14663,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -17308,6 +17236,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[9]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[11]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[12]{'args'}[0];
@@ -17425,6 +17354,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
@@ -17432,6 +17362,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
@@ -18626,6 +18557,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[13]{'args'}[0];
@@ -18710,6 +18642,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[22]{'args'}[0]{'contents'}[13]{'args'}[0];
@@ -18879,6 +18812,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -18886,6 +18820,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -18909,6 +18844,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -18916,6 +18852,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -20288,6 +20225,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0];
@@ -20431,6 +20369,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
@@ -20438,6 +20377,7 @@
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};

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

Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl     
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl     
2016-03-28 10:06:23 UTC (rev 7068)
@@ -1607,7 +1607,6 @@
                         }
                       ],
                       'cmdname' => '"',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 17,
@@ -1633,7 +1632,6 @@
                         }
                       ],
                       'cmdname' => '~',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1659,7 +1657,6 @@
                                 }
                               ],
                               'cmdname' => 'dotless',
-                              'contents' => [],
                               'line_nr' => {},
                               'parent' => {}
                             }
@@ -1669,7 +1666,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1691,7 +1687,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1713,7 +1708,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1735,6 +1729,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -1755,7 +1750,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1777,7 +1771,6 @@
                         }
                       ],
                       'cmdname' => '=',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1799,7 +1792,6 @@
                         }
                       ],
                       'cmdname' => 'ringaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1821,7 +1813,6 @@
                         }
                       ],
                       'cmdname' => 'H',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1843,7 +1834,6 @@
                         }
                       ],
                       'cmdname' => 'ogonek',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -1930,7 +1920,6 @@
                         }
                       ],
                       'cmdname' => 'dotaccent',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 18,
@@ -1956,7 +1945,6 @@
                         }
                       ],
                       'cmdname' => 'u',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1978,7 +1966,6 @@
                         }
                       ],
                       'cmdname' => 'ubaraccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2000,7 +1987,6 @@
                         }
                       ],
                       'cmdname' => 'udotaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2022,7 +2008,6 @@
                         }
                       ],
                       'cmdname' => 'v',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2044,7 +2029,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2066,7 +2050,6 @@
                         }
                       ],
                       'cmdname' => 'tieaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -2145,7 +2128,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 19,
@@ -2175,6 +2157,7 @@
                                 }
                               ],
                               'cmdname' => '=',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -2183,7 +2166,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -2209,6 +2191,7 @@
                                 }
                               ],
                               'cmdname' => '\'',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -2217,7 +2200,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -7213,7 +7195,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 64,
@@ -7239,7 +7220,6 @@
                 }
               ],
               'cmdname' => '~',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7265,7 +7245,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -7275,7 +7254,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7297,7 +7275,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7319,7 +7296,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7341,6 +7317,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -7361,7 +7338,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7383,7 +7359,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7405,7 +7380,6 @@
                 }
               ],
               'cmdname' => 'ringaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7427,7 +7401,6 @@
                 }
               ],
               'cmdname' => 'H',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7449,7 +7422,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7528,7 +7500,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 65,
@@ -7554,7 +7525,6 @@
                 }
               ],
               'cmdname' => '~',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7580,7 +7550,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -7590,7 +7559,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7612,7 +7580,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7634,7 +7601,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7656,6 +7622,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -7676,7 +7643,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7698,7 +7664,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7720,7 +7685,6 @@
                 }
               ],
               'cmdname' => 'ringaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7742,7 +7706,6 @@
                 }
               ],
               'cmdname' => 'H',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7764,7 +7727,6 @@
                 }
               ],
               'cmdname' => 'ogonek',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7845,7 +7807,6 @@
                 }
               ],
               'cmdname' => 'dotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 67,
@@ -7871,7 +7832,6 @@
                 }
               ],
               'cmdname' => 'u',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7893,7 +7853,6 @@
                 }
               ],
               'cmdname' => 'ubaraccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7915,7 +7874,6 @@
                 }
               ],
               'cmdname' => 'udotaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7937,7 +7895,6 @@
                 }
               ],
               'cmdname' => 'v',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7959,7 +7916,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -7981,7 +7937,6 @@
                 }
               ],
               'cmdname' => 'tieaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8052,7 +8007,6 @@
                 }
               ],
               'cmdname' => 'dotaccent',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 68,
@@ -8078,7 +8032,6 @@
                 }
               ],
               'cmdname' => 'u',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8100,7 +8053,6 @@
                 }
               ],
               'cmdname' => 'ubaraccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8122,7 +8074,6 @@
                 }
               ],
               'cmdname' => 'udotaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8144,7 +8095,6 @@
                 }
               ],
               'cmdname' => 'v',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8166,7 +8116,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8188,7 +8137,6 @@
                 }
               ],
               'cmdname' => 'tieaccent',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8261,7 +8209,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 70,
@@ -8291,6 +8238,7 @@
                         }
                       ],
                       'cmdname' => '=',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8299,7 +8247,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8325,6 +8272,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8333,7 +8281,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8396,7 +8343,6 @@
                 }
               ],
               'cmdname' => 'dotless',
-              'contents' => [],
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 71,
@@ -8426,6 +8372,7 @@
                         }
                       ],
                       'cmdname' => '=',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8434,7 +8381,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -8460,6 +8406,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -8468,7 +8415,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -14116,7 +14062,6 @@
                         }
                       ],
                       'cmdname' => '"',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 136,
@@ -14142,7 +14087,6 @@
                         }
                       ],
                       'cmdname' => '~',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14168,7 +14112,6 @@
                                 }
                               ],
                               'cmdname' => 'dotless',
-                              'contents' => [],
                               'line_nr' => {},
                               'parent' => {}
                             }
@@ -14178,7 +14121,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14200,7 +14142,6 @@
                         }
                       ],
                       'cmdname' => '^',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14222,7 +14163,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14244,6 +14184,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -14264,7 +14205,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14286,7 +14226,6 @@
                         }
                       ],
                       'cmdname' => '=',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14308,7 +14247,6 @@
                         }
                       ],
                       'cmdname' => 'ringaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14330,7 +14268,6 @@
                         }
                       ],
                       'cmdname' => 'H',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14352,7 +14289,6 @@
                         }
                       ],
                       'cmdname' => 'ogonek',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -14447,7 +14383,6 @@
                         }
                       ],
                       'cmdname' => 'dotaccent',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 137,
@@ -14473,7 +14408,6 @@
                         }
                       ],
                       'cmdname' => 'u',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14495,7 +14429,6 @@
                         }
                       ],
                       'cmdname' => 'ubaraccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14517,7 +14450,6 @@
                         }
                       ],
                       'cmdname' => 'udotaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14539,7 +14471,6 @@
                         }
                       ],
                       'cmdname' => 'v',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14561,7 +14492,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14583,7 +14513,6 @@
                         }
                       ],
                       'cmdname' => 'tieaccent',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -14662,7 +14591,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 138,
@@ -14692,6 +14620,7 @@
                                 }
                               ],
                               'cmdname' => '=',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -14700,7 +14629,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -14726,6 +14654,7 @@
                                 }
                               ],
                               'cmdname' => '\'',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -14734,7 +14663,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -17308,6 +17236,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[9]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[11]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[12]{'args'}[0];
@@ -17425,6 +17354,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
@@ -17432,6 +17362,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'line_nr'};
@@ -18626,6 +18557,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[13]{'args'}[0];
@@ -18710,6 +18642,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[22]{'args'}[0]{'contents'}[13]{'args'}[0];
@@ -18879,6 +18812,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -18886,6 +18820,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -18909,6 +18844,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -18916,6 +18852,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
@@ -20288,6 +20225,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0];
@@ -20431,6 +20369,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
@@ -20438,6 +20377,7 @@
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};

Modified: 
trunk/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl
===================================================================
--- trunk/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl 
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl 
2016-03-28 10:06:23 UTC (rev 7068)
@@ -100,6 +100,7 @@
             }
           ],
           'cmdname' => '~',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -175,6 +176,7 @@
                 }
               ],
               'cmdname' => '~',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -257,6 +259,7 @@
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2];
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3];
+$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[1]{'line_nr'};
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2];
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2];
 $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[2]{'parent'} 
= $result_trees{'documentencoding_utf8_and_insertions'};
@@ -270,6 +273,7 @@
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
+$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'line_nr'};
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[4];

Modified: trunk/tp/t/results/converters_tests/empty_accent.pl
===================================================================
--- trunk/tp/t/results/converters_tests/empty_accent.pl 2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/converters_tests/empty_accent.pl 2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -18,7 +18,6 @@
             }
           ],
           'cmdname' => '`',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 1,

Modified: 
trunk/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl
===================================================================
--- trunk/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl   
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl   
2016-03-28 10:06:23 UTC (rev 7068)
@@ -59,6 +59,7 @@
             }
           ],
           'cmdname' => '~',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -134,6 +135,7 @@
                 }
               ],
               'cmdname' => '~',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -209,6 +211,7 @@
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1];
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3];
+$result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[1]{'line_nr'};
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1];
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1];
 $result_trees{'no_documentencoding_and_insertions'}{'contents'}[1]{'parent'} = 
$result_trees{'no_documentencoding_and_insertions'};
@@ -222,6 +225,7 @@
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'line_nr'};
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[3];

Modified: trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
===================================================================
--- trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl        
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl        
2016-03-28 10:06:23 UTC (rev 7068)
@@ -150,6 +150,11 @@
                                 }
                               ],
                               'cmdname' => '~',
+                              'line_nr' => {
+                                'file_name' => '',
+                                'line_nr' => 6,
+                                'macro' => ''
+                              },
                               'parent' => {}
                             },
                             {
@@ -191,11 +196,7 @@
                       ],
                       'cmdname' => 'sc',
                       'contents' => [],
-                      'line_nr' => {
-                        'file_name' => '',
-                        'line_nr' => 6,
-                        'macro' => ''
-                      },
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -216,6 +217,7 @@
                         }
                       ],
                       'cmdname' => '"',
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -240,7 +242,6 @@
                                 }
                               ],
                               'cmdname' => 'dotless',
-                              'contents' => [],
                               'line_nr' => {},
                               'parent' => {}
                             }
@@ -250,7 +251,6 @@
                         }
                       ],
                       'cmdname' => '"',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -276,6 +276,7 @@
                                 }
                               ],
                               'cmdname' => '=',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -284,7 +285,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -326,6 +326,7 @@
                                 }
                               ],
                               'cmdname' => '\'',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -334,7 +335,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -519,6 +519,11 @@
                         }
                       ],
                       'cmdname' => '~',
+                      'line_nr' => {
+                        'file_name' => '',
+                        'line_nr' => 9,
+                        'macro' => ''
+                      },
                       'parent' => {}
                     },
                     {
@@ -560,11 +565,7 @@
               ],
               'cmdname' => 'sc',
               'contents' => [],
-              'line_nr' => {
-                'file_name' => '',
-                'line_nr' => 9,
-                'macro' => ''
-              },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -585,6 +586,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -609,7 +611,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -619,7 +620,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -645,6 +645,7 @@
                         }
                       ],
                       'cmdname' => '=',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -653,7 +654,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -695,6 +695,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -703,7 +704,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -821,6 +821,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -845,7 +846,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -855,7 +855,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -881,6 +880,7 @@
                         }
                       ],
                       'cmdname' => '=',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -889,7 +889,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -931,6 +930,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -939,7 +939,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -1066,6 +1065,7 @@
                         }
                       ],
                       'cmdname' => '"',
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -1102,7 +1102,6 @@
                                 }
                               ],
                               'cmdname' => 'dotless',
-                              'contents' => [],
                               'line_nr' => {},
                               'parent' => {}
                             }
@@ -1112,7 +1111,6 @@
                         }
                       ],
                       'cmdname' => '"',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1138,6 +1136,7 @@
                                 }
                               ],
                               'cmdname' => '=',
+                              'line_nr' => {},
                               'parent' => {}
                             }
                           ],
@@ -1146,7 +1145,6 @@
                         }
                       ],
                       'cmdname' => '`',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     },
@@ -1313,25 +1311,28 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'};
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'};
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[6]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'};
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[8]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[9];
@@ -1339,9 +1340,10 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[10]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'};
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[12]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13];
@@ -1366,7 +1368,7 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[12];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'};
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
@@ -1397,25 +1399,28 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[10];
@@ -1423,9 +1428,10 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[14];
@@ -1448,7 +1454,7 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[14];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'line_nr'} = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'line_nr'} = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'parent'} = 
$result_trees{'some_at_commands_in_ref_nodes'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
@@ -1459,6 +1465,7 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -1471,6 +1478,7 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[8]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'};
@@ -1481,6 +1489,7 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[12]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'};
@@ -1506,6 +1515,7 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
@@ -1520,6 +1530,7 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};

Modified: trunk/tp/t/results/converters_tests/weird_accents.pl
===================================================================
--- trunk/tp/t/results/converters_tests/weird_accents.pl        2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/weird_accents.pl        2016-03-28 
10:06:23 UTC (rev 7068)
@@ -168,7 +168,6 @@
                                 }
                               ],
                               'cmdname' => 'dotless',
-                              'contents' => [],
                               'line_nr' => {
                                 'file_name' => '',
                                 'line_nr' => 6,
@@ -182,7 +181,6 @@
                         }
                       ],
                       'cmdname' => '~',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -192,7 +190,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -235,7 +232,6 @@
                                 }
                               ],
                               'cmdname' => '~',
-                              'contents' => [],
                               'line_nr' => {
                                 'file_name' => '',
                                 'line_nr' => 8,
@@ -249,7 +245,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -259,7 +254,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -298,7 +292,6 @@
                         }
                       ],
                       'cmdname' => 'ubaraccent',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 10,
@@ -312,7 +305,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -355,6 +347,11 @@
                                 }
                               ],
                               'cmdname' => '`',
+                              'line_nr' => {
+                                'file_name' => '',
+                                'line_nr' => 12,
+                                'macro' => ''
+                              },
                               'parent' => {}
                             }
                           ],
@@ -363,12 +360,7 @@
                         }
                       ],
                       'cmdname' => 'udotaccent',
-                      'contents' => [],
-                      'line_nr' => {
-                        'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
-                      },
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -377,7 +369,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -420,7 +411,6 @@
                                 }
                               ],
                               'cmdname' => '`',
-                              'contents' => [],
                               'line_nr' => {
                                 'file_name' => '',
                                 'line_nr' => 14,
@@ -434,7 +424,6 @@
                         }
                       ],
                       'cmdname' => '\'',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -444,7 +433,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -536,9 +524,10 @@
 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0];
 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0];
-$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7];
 $result_trees{'weird_accents'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'weird_accents'}{'contents'}[2];

Modified: trunk/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
===================================================================
--- trunk/tp/t/results/converters_tests/weird_accents_disable_encoding.pl       
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/converters_tests/weird_accents_disable_encoding.pl       
2016-03-28 10:06:23 UTC (rev 7068)
@@ -168,7 +168,6 @@
                                 }
                               ],
                               'cmdname' => 'dotless',
-                              'contents' => [],
                               'line_nr' => {
                                 'file_name' => '',
                                 'line_nr' => 6,
@@ -182,7 +181,6 @@
                         }
                       ],
                       'cmdname' => '~',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -192,7 +190,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -235,7 +232,6 @@
                                 }
                               ],
                               'cmdname' => '~',
-                              'contents' => [],
                               'line_nr' => {
                                 'file_name' => '',
                                 'line_nr' => 8,
@@ -249,7 +245,6 @@
                         }
                       ],
                       'cmdname' => ',',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -259,7 +254,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -298,7 +292,6 @@
                         }
                       ],
                       'cmdname' => 'ubaraccent',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 10,
@@ -312,7 +305,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -355,6 +347,11 @@
                                 }
                               ],
                               'cmdname' => '`',
+                              'line_nr' => {
+                                'file_name' => '',
+                                'line_nr' => 12,
+                                'macro' => ''
+                              },
                               'parent' => {}
                             }
                           ],
@@ -363,12 +360,7 @@
                         }
                       ],
                       'cmdname' => 'udotaccent',
-                      'contents' => [],
-                      'line_nr' => {
-                        'file_name' => '',
-                        'line_nr' => 12,
-                        'macro' => ''
-                      },
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -377,7 +369,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -420,7 +411,6 @@
                                 }
                               ],
                               'cmdname' => '`',
-                              'contents' => [],
                               'line_nr' => {
                                 'file_name' => '',
                                 'line_nr' => 14,
@@ -434,7 +424,6 @@
                         }
                       ],
                       'cmdname' => '\'',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -444,7 +433,6 @@
                 }
               ],
               'cmdname' => '=',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -536,9 +524,10 @@
 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0];
 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0];
-$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'parent'}
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'parent'}
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'weird_accents_disable_encoding'}{'contents'}[2];

Modified: trunk/tp/t/results/coverage/accent_and_dash.pl
===================================================================
--- trunk/tp/t/results/coverage/accent_and_dash.pl      2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage/accent_and_dash.pl      2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -23,7 +23,6 @@
             }
           ],
           'cmdname' => '^',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 1,

Modified: trunk/tp/t/results/coverage/accent_no_closed.pl
===================================================================
--- trunk/tp/t/results/coverage/accent_no_closed.pl     2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage/accent_no_closed.pl     2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -23,7 +23,6 @@
             }
           ],
           'cmdname' => '~',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 1,

Modified: trunk/tp/t/results/coverage/accent_no_closed_comment.pl
===================================================================
--- trunk/tp/t/results/coverage/accent_no_closed_comment.pl     2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/coverage/accent_no_closed_comment.pl     2016-03-28 
10:06:23 UTC (rev 7068)
@@ -41,7 +41,6 @@
             }
           ],
           'cmdname' => '~',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 1,

Modified: trunk/tp/t/results/coverage/accent_no_closed_newline.pl
===================================================================
--- trunk/tp/t/results/coverage/accent_no_closed_newline.pl     2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/coverage/accent_no_closed_newline.pl     2016-03-28 
10:06:23 UTC (rev 7068)
@@ -30,7 +30,6 @@
             }
           ],
           'cmdname' => '~',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 1,

Modified: trunk/tp/t/results/coverage/accent_no_closed_paragraph.pl
===================================================================
--- trunk/tp/t/results/coverage/accent_no_closed_paragraph.pl   2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/coverage/accent_no_closed_paragraph.pl   2016-03-28 
10:06:23 UTC (rev 7068)
@@ -30,7 +30,6 @@
             }
           ],
           'cmdname' => '~',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 1,

Modified: trunk/tp/t/results/coverage/accents_errors.pl
===================================================================
--- trunk/tp/t/results/coverage/accents_errors.pl       2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage/accents_errors.pl       2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -15,7 +15,11 @@
         },
         {
           'cmdname' => 'ringaccent',
-          'contents' => [],
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -29,10 +33,14 @@
         },
         {
           'cmdname' => 'ringaccent',
-          'contents' => [],
           'extra' => {
             'spaces' => '  '
           },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 2,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -54,7 +62,11 @@
         },
         {
           'cmdname' => 'ringaccent',
-          'contents' => [],
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -84,7 +96,11 @@
         },
         {
           'cmdname' => '~',
-          'contents' => [],
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 5,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -98,7 +114,11 @@
         },
         {
           'cmdname' => '~',
-          'contents' => [],
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 6,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -120,7 +140,11 @@
         },
         {
           'cmdname' => '~',
-          'contents' => [],
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 7,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: trunk/tp/t/results/coverage/at_after_accent_command.pl
===================================================================
--- trunk/tp/t/results/coverage/at_after_accent_command.pl      2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/coverage/at_after_accent_command.pl      2016-03-28 
10:06:23 UTC (rev 7068)
@@ -11,10 +11,14 @@
       'contents' => [
         {
           'cmdname' => 'ringaccent',
-          'contents' => [],
           'extra' => {
             'spaces' => ' '
           },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -27,7 +31,7 @@
         },
         {
           'cmdname' => '^',
-          'contents' => [],
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -49,6 +53,7 @@
 
$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'at_after_accent_command'}{'contents'}[0];
 
$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'at_after_accent_command'}{'contents'}[0];
 
$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'at_after_accent_command'}{'contents'}[0];
+$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'at_after_accent_command'}{'contents'}[0];
 
$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'at_after_accent_command'}{'contents'}[0];
 
$result_trees{'at_after_accent_command'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'at_after_accent_command'}{'contents'}[0];

Modified: trunk/tp/t/results/coverage/commands.pl
===================================================================
--- trunk/tp/t/results/coverage/commands.pl     2016-03-27 21:15:37 UTC (rev 
7067)
+++ trunk/tp/t/results/coverage/commands.pl     2016-03-28 10:06:23 UTC (rev 
7068)
@@ -52,6 +52,11 @@
             }
           ],
           'cmdname' => '"',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 2,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -76,12 +81,7 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
-                  'line_nr' => {
-                    'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
-                  },
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -90,7 +90,6 @@
             }
           ],
           'cmdname' => '^',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -112,7 +111,6 @@
             }
           ],
           'cmdname' => '~',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -137,6 +135,7 @@
           'extra' => {
             'spaces' => ' '
           },
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -461,18 +460,20 @@
 $result_trees{'commands'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'line_nr'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'line_nr'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
 $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[9];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'line_nr'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'line_nr'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
 $result_trees{'commands'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'parent'} 
= $result_trees{'commands'}{'contents'}[0]{'contents'}[11];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'line_nr'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
 $result_trees{'commands'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[13]{'args'}[0];

Modified: trunk/tp/t/results/coverage/lettered_accent_and_spaces.pl
===================================================================
--- trunk/tp/t/results/coverage/lettered_accent_and_spaces.pl   2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/coverage/lettered_accent_and_spaces.pl   2016-03-28 
10:06:23 UTC (rev 7068)
@@ -26,6 +26,11 @@
           'extra' => {
             'spaces' => '    '
           },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: trunk/tp/t/results/coverage/not_i_j_in_dotless.pl
===================================================================
--- trunk/tp/t/results/coverage/not_i_j_in_dotless.pl   2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage/not_i_j_in_dotless.pl   2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -26,6 +26,11 @@
           'extra' => {
             'spaces' => ' '
           },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -50,12 +55,7 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
-                  'line_nr' => {
-                    'file_name' => '',
-                    'line_nr' => 1,
-                    'macro' => ''
-                  },
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -64,7 +64,6 @@
             }
           ],
           'cmdname' => '^',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -85,9 +84,10 @@
 $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0];
 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2];
-$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'line_nr'} = 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'line_nr'} = 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0];
 $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'not_i_j_in_dotless'}{'contents'}[0];
 $result_trees{'not_i_j_in_dotless'}{'contents'}[0]{'parent'} = 
$result_trees{'not_i_j_in_dotless'};

Modified: trunk/tp/t/results/coverage/quotation_author.pl
===================================================================
--- trunk/tp/t/results/coverage/quotation_author.pl     2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage/quotation_author.pl     2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -104,6 +104,11 @@
                         }
                       ],
                       'cmdname' => '~',
+                      'line_nr' => {
+                        'file_name' => '',
+                        'line_nr' => 5,
+                        'macro' => ''
+                      },
                       'parent' => {}
                     },
                     {
@@ -131,11 +136,7 @@
                 'quotation' => {},
                 'spaces_after_command' => {}
               },
-              'line_nr' => {
-                'file_name' => '',
-                'line_nr' => 5,
-                'macro' => ''
-              },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -240,6 +241,7 @@
 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'misc_content'}[2]
 = 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3];
 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'quotation'}
 = $result_trees{'quotation_author'}{'contents'}[0];
 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3];
 $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'quotation_author'}{'contents'}[0];

Modified: trunk/tp/t/results/coverage/test_errormsg.pl
===================================================================
--- trunk/tp/t/results/coverage/test_errormsg.pl        2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage/test_errormsg.pl        2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -36,6 +36,11 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 2,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -57,11 +62,7 @@
                   ],
                   'cmdname' => 'code',
                   'contents' => [],
-                  'line_nr' => {
-                    'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
-                  },
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -108,13 +109,14 @@
 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][1]
 = 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][2]
 = 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][3]
 = 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'line_nr'} = 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'};
+$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'line_nr'} = 
$result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'test_errormsg'}{'contents'}[0];
 $result_trees{'test_errormsg'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'test_errormsg'}{'contents'}[0];
 $result_trees{'test_errormsg'}{'contents'}[0]{'parent'} = 
$result_trees{'test_errormsg'};

Modified: trunk/tp/t/results/coverage/unknown_accents.pl
===================================================================
--- trunk/tp/t/results/coverage/unknown_accents.pl      2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage/unknown_accents.pl      2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -23,6 +23,11 @@
             }
           ],
           'cmdname' => '"',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -43,6 +48,7 @@
             }
           ],
           'cmdname' => '"',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -63,6 +69,7 @@
             }
           ],
           'cmdname' => '"',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -83,6 +90,7 @@
             }
           ],
           'cmdname' => '"',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -116,6 +124,11 @@
             }
           ],
           'cmdname' => '\'',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -136,6 +149,7 @@
             }
           ],
           'cmdname' => '\'',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -156,6 +170,7 @@
             }
           ],
           'cmdname' => '\'',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -177,6 +192,11 @@
             }
           ],
           'cmdname' => '\'',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 4,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -197,6 +217,7 @@
             }
           ],
           'cmdname' => '\'',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -217,6 +238,7 @@
             }
           ],
           'cmdname' => '\'',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -250,7 +272,6 @@
             }
           ],
           'cmdname' => ',',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 6,
@@ -276,7 +297,6 @@
             }
           ],
           'cmdname' => ',',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -311,6 +331,11 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 8,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -331,6 +356,7 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -351,6 +377,7 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -371,6 +398,7 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -392,6 +420,11 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 9,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -412,6 +445,7 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -432,6 +466,7 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -452,6 +487,7 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -485,6 +521,11 @@
             }
           ],
           'cmdname' => '`',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 11,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -505,6 +546,7 @@
             }
           ],
           'cmdname' => '`',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -525,6 +567,7 @@
             }
           ],
           'cmdname' => '`',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -558,6 +601,11 @@
             }
           ],
           'cmdname' => '~',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 13,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -578,6 +626,7 @@
             }
           ],
           'cmdname' => '~',
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -598,14 +647,17 @@
 $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2];
+$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[0];
 $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4];
+$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[0];
 $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6];
+$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[0];
 $result_trees{'unknown_accents'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[0];
 $result_trees{'unknown_accents'}{'contents'}[0]{'parent'} = 
$result_trees{'unknown_accents'};
@@ -616,10 +668,12 @@
 $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[2];
 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2];
+$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[2];
 $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[2];
 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4];
+$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[2];
 $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[2];
 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6]{'args'}[0];
@@ -628,10 +682,12 @@
 $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[2];
 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8];
+$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[8]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[2];
 $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[2];
 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10];
+$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[6]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[10]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[2];
 $result_trees{'unknown_accents'}{'contents'}[2]{'contents'}[11]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[2];
 $result_trees{'unknown_accents'}{'contents'}[2]{'parent'} = 
$result_trees{'unknown_accents'};
@@ -653,14 +709,17 @@
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2];
+$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[3]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4];
+$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[4]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[5]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6];
+$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[6]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[7]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'args'}[0];
@@ -669,14 +728,17 @@
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[9]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10];
+$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[10]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[11]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12];
+$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[12]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[13]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14];
+$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[8]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[14]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 $result_trees{'unknown_accents'}{'contents'}[6]{'contents'}[15]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[6];
 $result_trees{'unknown_accents'}{'contents'}[6]{'parent'} = 
$result_trees{'unknown_accents'};
@@ -687,10 +749,12 @@
 $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[8];
 
$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2];
+$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[2]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[8];
 $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[3]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[8];
 
$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4];
+$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[4]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[8];
 $result_trees{'unknown_accents'}{'contents'}[8]{'contents'}[5]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[8];
 $result_trees{'unknown_accents'}{'contents'}[8]{'parent'} = 
$result_trees{'unknown_accents'};
@@ -701,6 +765,7 @@
 $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[1]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[10];
 
$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'args'}[0];
 
$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2];
+$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'line_nr'} = 
$result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[0]{'line_nr'};
 $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[2]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[10];
 $result_trees{'unknown_accents'}{'contents'}[10]{'contents'}[3]{'parent'} = 
$result_trees{'unknown_accents'}{'contents'}[10];
 $result_trees{'unknown_accents'}{'contents'}[10]{'parent'} = 
$result_trees{'unknown_accents'};

Modified: trunk/tp/t/results/coverage_braces/abbr_acronym.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/abbr_acronym.pl  2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage_braces/abbr_acronym.pl  2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -202,6 +202,11 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 4,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -248,6 +253,7 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -285,11 +291,7 @@
                   ],
                   'cmdname' => 'b',
                   'contents' => [],
-                  'line_nr' => {
-                    'file_name' => '',
-                    'line_nr' => 4,
-                    'macro' => ''
-                  },
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -352,6 +354,11 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 5,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -397,11 +404,7 @@
               'type' => 'empty_spaces_before_argument'
             }
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 5,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -456,6 +459,7 @@
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1];
+$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1]{'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'}[1]{'parent'}
 = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[3];
@@ -463,6 +467,7 @@
 
$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]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5];
+$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'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'}[5]{'parent'}
 = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[6]{'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];
@@ -475,7 +480,7 @@
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][2]
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[3];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][3]
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][4]
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5];
-$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'line_nr'} = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[5]{'line_nr'};
+$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'line_nr'} = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'abbr_acronym'}{'contents'}[0];
 $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'abbr_acronym'}{'contents'}[0];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -491,6 +496,7 @@
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][2]
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][3]
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3];
 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'extra'}{'explanation_contents'}
 = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'extra'}{'brace_command_contents'}[1];
+$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'line_nr'} = 
$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'abbr_acronym'}{'contents'}[0];
 $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'abbr_acronym'}{'contents'}[0];
 $result_trees{'abbr_acronym'}{'contents'}[0]{'parent'} = 
$result_trees{'abbr_acronym'};

Modified: trunk/tp/t/results/coverage_braces/empty_commands.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/empty_commands.pl        2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/coverage_braces/empty_commands.pl        2016-03-28 
10:06:23 UTC (rev 7068)
@@ -174,7 +174,6 @@
             }
           ],
           'cmdname' => '~',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -191,7 +190,6 @@
             }
           ],
           'cmdname' => 'dotless',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },

Modified: trunk/tp/t/results/coverage_braces/nested_args.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/nested_args.pl   2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage_braces/nested_args.pl   2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -103,7 +103,6 @@
                     }
                   ],
                   'cmdname' => '~',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },

Modified: trunk/tp/t/results/coverage_braces/nested_in_sc.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/nested_in_sc.pl  2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage_braces/nested_in_sc.pl  2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -35,6 +35,11 @@
                             }
                           ],
                           'cmdname' => '~',
+                          'line_nr' => {
+                            'file_name' => '',
+                            'line_nr' => 1,
+                            'macro' => ''
+                          },
                           'parent' => {}
                         },
                         {
@@ -95,12 +100,7 @@
                             }
                           ],
                           'cmdname' => '~',
-                          'contents' => [],
-                          'line_nr' => {
-                            'file_name' => '',
-                            'line_nr' => 1,
-                            'macro' => ''
-                          },
+                          'line_nr' => {},
                           'parent' => {}
                         },
                         {
@@ -264,13 +264,14 @@
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'extra'}{'spaces_before_argument'}{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0];
@@ -279,17 +280,17 @@
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'contents'}[1];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'line_nr'} = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'};
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'line_nr'} = 
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested_in_sc'}{'contents'}[0];
 $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nested_in_sc'}{'contents'}[0];
 $result_trees{'nested_in_sc'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_in_sc'};

Modified: trunk/tp/t/results/coverage_braces/test_image.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/test_image.pl    2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/coverage_braces/test_image.pl    2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -457,7 +457,6 @@
                                             }
                                           ],
                                           'cmdname' => 'dotless',
-                                          'contents' => [],
                                           'line_nr' => {},
                                           'parent' => {}
                                         }
@@ -467,7 +466,6 @@
                                     }
                                   ],
                                   'cmdname' => '^',
-                                  'contents' => [],
                                   'line_nr' => {},
                                   'parent' => {}
                                 },
@@ -1136,7 +1134,6 @@
                                         }
                                       ],
                                       'cmdname' => 'dotless',
-                                      'contents' => [],
                                       'line_nr' => {},
                                       'parent' => {}
                                     }
@@ -1146,7 +1143,6 @@
                                 }
                               ],
                               'cmdname' => '^',
-                              'contents' => [],
                               'line_nr' => {},
                               'parent' => {}
                             },
@@ -1766,7 +1762,6 @@
                                             }
                                           ],
                                           'cmdname' => 'dotless',
-                                          'contents' => [],
                                           'line_nr' => {},
                                           'parent' => {}
                                         }
@@ -1776,7 +1771,6 @@
                                     }
                                   ],
                                   'cmdname' => '^',
-                                  'contents' => [],
                                   'line_nr' => {},
                                   'parent' => {}
                                 },
@@ -2449,7 +2443,6 @@
                                             }
                                           ],
                                           'cmdname' => 'dotless',
-                                          'contents' => [],
                                           'line_nr' => {},
                                           'parent' => {}
                                         }
@@ -2459,7 +2452,6 @@
                                     }
                                   ],
                                   'cmdname' => '^',
-                                  'contents' => [],
                                   'line_nr' => {},
                                   'parent' => {}
                                 },
@@ -3040,7 +3032,6 @@
                                                     }
                                                   ],
                                                   'cmdname' => 'dotless',
-                                                  'contents' => [],
                                                   'line_nr' => {},
                                                   'parent' => {}
                                                 }
@@ -3050,7 +3041,6 @@
                                             }
                                           ],
                                           'cmdname' => '^',
-                                          'contents' => [],
                                           'line_nr' => {},
                                           'parent' => {}
                                         },

Modified: trunk/tp/t/results/float/complex_float.pl
===================================================================
--- trunk/tp/t/results/float/complex_float.pl   2016-03-27 21:15:37 UTC (rev 
7067)
+++ trunk/tp/t/results/float/complex_float.pl   2016-03-28 10:06:23 UTC (rev 
7068)
@@ -953,6 +953,11 @@
                                     }
                                   ],
                                   'cmdname' => '\'',
+                                  'line_nr' => {
+                                    'file_name' => '',
+                                    'line_nr' => 49,
+                                    'macro' => ''
+                                  },
                                   'parent' => {}
                                 },
                                 {
@@ -973,12 +978,7 @@
                                             }
                                           ],
                                           'cmdname' => 'dotless',
-                                          'contents' => [],
-                                          'line_nr' => {
-                                            'file_name' => '',
-                                            'line_nr' => 49,
-                                            'macro' => ''
-                                          },
+                                          'line_nr' => {},
                                           'parent' => {}
                                         }
                                       ],
@@ -987,7 +987,6 @@
                                     }
                                   ],
                                   'cmdname' => '^',
-                                  'contents' => [],
                                   'line_nr' => {},
                                   'parent' => {}
                                 }
@@ -2165,6 +2164,11 @@
                                             }
                                           ],
                                           'cmdname' => '\'',
+                                          'line_nr' => {
+                                            'file_name' => '',
+                                            'line_nr' => 84,
+                                            'macro' => ''
+                                          },
                                           'parent' => {}
                                         },
                                         {
@@ -2185,12 +2189,7 @@
                                                     }
                                                   ],
                                                   'cmdname' => 'dotless',
-                                                  'contents' => [],
-                                                  'line_nr' => {
-                                                    'file_name' => '',
-                                                    'line_nr' => 84,
-                                                    'macro' => ''
-                                                  },
+                                                  'line_nr' => {},
                                                   'parent' => {}
                                                 }
                                               ],
@@ -2199,7 +2198,6 @@
                                             }
                                           ],
                                           'cmdname' => '^',
-                                          'contents' => [],
                                           'line_nr' => {},
                                           'parent' => {}
                                         }
@@ -2428,6 +2426,11 @@
                                             }
                                           ],
                                           'cmdname' => '\'',
+                                          'line_nr' => {
+                                            'file_name' => '',
+                                            'line_nr' => 87,
+                                            'macro' => ''
+                                          },
                                           'parent' => {}
                                         },
                                         {
@@ -2448,12 +2451,7 @@
                                                     }
                                                   ],
                                                   'cmdname' => 'dotless',
-                                                  'contents' => [],
-                                                  'line_nr' => {
-                                                    'file_name' => '',
-                                                    'line_nr' => 87,
-                                                    'macro' => ''
-                                                  },
+                                                  'line_nr' => {},
                                                   'parent' => {}
                                                 }
                                               ],
@@ -2462,7 +2460,6 @@
                                             }
                                           ],
                                           'cmdname' => '^',
-                                          'contents' => [],
                                           'line_nr' => {},
                                           'parent' => {}
                                         }
@@ -3908,6 +3905,11 @@
                                             }
                                           ],
                                           'cmdname' => '\'',
+                                          'line_nr' => {
+                                            'file_name' => '',
+                                            'line_nr' => 131,
+                                            'macro' => ''
+                                          },
                                           'parent' => {}
                                         },
                                         {
@@ -3928,12 +3930,7 @@
                                                     }
                                                   ],
                                                   'cmdname' => 'dotless',
-                                                  'contents' => [],
-                                                  'line_nr' => {
-                                                    'file_name' => '',
-                                                    'line_nr' => 131,
-                                                    'macro' => ''
-                                                  },
+                                                  'line_nr' => {},
                                                   'parent' => {}
                                                 }
                                               ],
@@ -3942,7 +3939,6 @@
                                             }
                                           ],
                                           'cmdname' => '^',
-                                          'contents' => [],
                                           'line_nr' => {},
                                           'parent' => {}
                                         }
@@ -4454,30 +4450,31 @@
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[3]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[4]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[5]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[6]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[7]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14]{'contents'}[8]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[14];
@@ -4684,30 +4681,31 @@
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[3]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[4]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[5]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[6]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[7]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19]{'contents'}[8]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[19];
@@ -4736,30 +4734,31 @@
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0];
@@ -4776,7 +4775,7 @@
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'extra'}{'spaces_before_argument'}{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[20]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[21]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
@@ -5020,30 +5019,31 @@
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[3]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[4]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[5]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[6]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[7]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'contents'}[8]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19];

Modified: trunk/tp/t/results/float/float_with_at_commands.pl
===================================================================
--- trunk/tp/t/results/float/float_with_at_commands.pl  2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/float/float_with_at_commands.pl  2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -37,6 +37,11 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
+              },
               'parent' => {}
             },
             {
@@ -71,6 +76,7 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -91,6 +97,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -136,6 +143,11 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 3,
+                'macro' => ''
+              },
               'parent' => {}
             },
             {
@@ -156,6 +168,7 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -191,6 +204,11 @@
                         }
                       ],
                       'cmdname' => '`',
+                      'line_nr' => {
+                        'file_name' => '',
+                        'line_nr' => 4,
+                        'macro' => ''
+                      },
                       'parent' => {}
                     },
                     {
@@ -211,6 +229,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -236,11 +255,7 @@
               'type' => 'empty_spaces_before_argument'
             }
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -331,11 +346,7 @@
           'normalized' => 'entr_00e9e'
         }
       },
-      'line_nr' => {
-        'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
-      },
+      'line_nr' => {},
       'number' => 1,
       'parent' => {}
     },
@@ -381,6 +392,11 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 9,
+                'macro' => ''
+              },
               'parent' => {}
             },
             {
@@ -410,11 +426,7 @@
           'normalized' => 'entr_00e9e'
         }
       },
-      'line_nr' => {
-        'file_name' => '',
-        'line_nr' => 9,
-        'macro' => ''
-      },
+      'line_nr' => {},
       'parent' => {}
     }
   ],
@@ -431,10 +443,12 @@
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4];
+$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[1];
@@ -447,6 +461,7 @@
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'};
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'float_with_at_commands'}{'contents'}[0];
@@ -457,12 +472,14 @@
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'float_with_at_commands'}{'contents'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'float_with_at_commands'}{'contents'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[4]{'parent'} 
= $result_trees{'float_with_at_commands'}{'contents'}[0];
@@ -493,6 +510,7 @@
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'extra'}{'type'}{'content'}[1]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'extra'}{'type'}{'content'}[2]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'float_with_at_commands'}{'contents'}[0]{'line_nr'} = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
 $result_trees{'float_with_at_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'float_with_at_commands'};
 $result_trees{'float_with_at_commands'}{'contents'}[1]{'parent'} = 
$result_trees{'float_with_at_commands'};
 $result_trees{'float_with_at_commands'}{'contents'}[2]{'parent'} = 
$result_trees{'float_with_at_commands'};
@@ -509,6 +527,7 @@
 
$result_trees{'float_with_at_commands'}{'contents'}[3]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[3]{'extra'}{'type'}{'content'}[1]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'float_with_at_commands'}{'contents'}[3]{'extra'}{'type'}{'content'}[2]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'float_with_at_commands'}{'contents'}[3]{'line_nr'} = 
$result_trees{'float_with_at_commands'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
 $result_trees{'float_with_at_commands'}{'contents'}[3]{'parent'} = 
$result_trees{'float_with_at_commands'};
 
 $result_texis{'float_with_at_commands'} = '@float address@hidden'ee, 
address@hidden address@hidden'ee

Modified: trunk/tp/t/results/float/listoffloats_with_commands.pl
===================================================================
--- trunk/tp/t/results/float/listoffloats_with_commands.pl      2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/float/listoffloats_with_commands.pl      2016-03-28 
10:06:23 UTC (rev 7068)
@@ -37,6 +37,11 @@
                 }
               ],
               'cmdname' => '\'',
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
+              },
               'parent' => {}
             },
             {
@@ -57,6 +62,7 @@
                 }
               ],
               'cmdname' => '`',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -88,11 +94,7 @@
           'normalized' => 'th_00e9or_00e8me'
         }
       },
-      'line_nr' => {
-        'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
-      },
+      'line_nr' => {},
       'parent' => {}
     }
   ],
@@ -107,6 +109,7 @@
 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0];
 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0];
 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0];
 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0];
@@ -117,6 +120,7 @@
 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'extra'}{'type'}{'content'}[2]
 = 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[3];
 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'extra'}{'type'}{'content'}[3]
 = 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'extra'}{'type'}{'content'}[4]
 = 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'line_nr'} = 
$result_trees{'listoffloats_with_commands'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
 $result_trees{'listoffloats_with_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'listoffloats_with_commands'};
 
 $result_texis{'listoffloats_with_commands'} = '@listoffloats 
address@hidden'address@hidden

Modified: trunk/tp/t/results/float/numbering_captions_listoffloats.pl
===================================================================
--- trunk/tp/t/results/float/numbering_captions_listoffloats.pl 2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/float/numbering_captions_listoffloats.pl 2016-03-28 
10:06:23 UTC (rev 7068)
@@ -2420,6 +2420,11 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 77,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -2440,6 +2445,7 @@
                     }
                   ],
                   'cmdname' => '`',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -2493,6 +2499,11 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 78,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -2513,6 +2524,7 @@
                     }
                   ],
                   'cmdname' => '`',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -2554,6 +2566,11 @@
                             }
                           ],
                           'cmdname' => '\'',
+                          'line_nr' => {
+                            'file_name' => '',
+                            'line_nr' => 80,
+                            'macro' => ''
+                          },
                           'parent' => {}
                         },
                         {
@@ -2574,6 +2591,7 @@
                             }
                           ],
                           'cmdname' => '`',
+                          'line_nr' => {},
                           'parent' => {}
                         },
                         {
@@ -2599,11 +2617,7 @@
                   'type' => 'empty_spaces_before_argument'
                 }
               },
-              'line_nr' => {
-                'file_name' => '',
-                'line_nr' => 80,
-                'macro' => ''
-              },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -2685,11 +2699,7 @@
             }
           },
           'float_section' => {},
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 77,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'number' => '1.1',
           'parent' => {}
         },
@@ -6479,6 +6489,11 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 196,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -6499,6 +6514,7 @@
                     }
                   ],
                   'cmdname' => '`',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -6530,11 +6546,7 @@
               'normalized' => 'th_00e9or_00e8me'
             }
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 196,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {}
         },
         {
@@ -7035,6 +7047,7 @@
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
@@ -7048,6 +7061,7 @@
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
@@ -7059,12 +7073,14 @@
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'extra'}{'spaces_before_argument'}{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[4];
@@ -7091,6 +7107,7 @@
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'type'}{'content'}[3]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'type'}{'content'}[4]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
@@ -7797,6 +7814,7 @@
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0];
@@ -7807,6 +7825,7 @@
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'extra'}{'type'}{'content'}[2]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'extra'}{'type'}{'content'}[3]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'extra'}{'type'}{'content'}[4]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'line_nr'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[12]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[13]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[18];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'args'}[0]{'contents'}[1];

Modified: trunk/tp/t/results/html_tests/documentdescription.pl
===================================================================
--- trunk/tp/t/results/html_tests/documentdescription.pl        2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/html_tests/documentdescription.pl        2016-03-28 
10:06:23 UTC (rev 7068)
@@ -143,7 +143,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {},
                           'parent' => {}
                         }
@@ -153,7 +152,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },

Modified: trunk/tp/t/results/html_tests/no_use_iso.pl
===================================================================
--- trunk/tp/t/results/html_tests/no_use_iso.pl 2016-03-27 21:15:37 UTC (rev 
7067)
+++ trunk/tp/t/results/html_tests/no_use_iso.pl 2016-03-28 10:06:23 UTC (rev 
7068)
@@ -27,6 +27,11 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: trunk/tp/t/results/html_tests/redirection_same_labels.pl
===================================================================
--- trunk/tp/t/results/html_tests/redirection_same_labels.pl    2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/html_tests/redirection_same_labels.pl    2016-03-28 
10:06:23 UTC (rev 7068)
@@ -538,6 +538,11 @@
                           }
                         ],
                         'cmdname' => '"',
+                        'line_nr' => {
+                          'file_name' => '',
+                          'line_nr' => 18,
+                          'macro' => ''
+                        },
                         'parent' => {}
                       }
                     ],
@@ -576,11 +581,7 @@
                     'normalized' => '_00ef'
                   }
                 },
-                'line_nr' => {
-                  'file_name' => '',
-                  'line_nr' => 18,
-                  'macro' => ''
-                },
+                'line_nr' => {},
                 'parent' => {},
                 'type' => 'menu_entry'
               },
@@ -611,7 +612,6 @@
                                   }
                                 ],
                                 'cmdname' => 'dotless',
-                                'contents' => [],
                                 'line_nr' => {
                                   'file_name' => '',
                                   'line_nr' => 19,
@@ -625,7 +625,6 @@
                           }
                         ],
                         'cmdname' => '~',
-                        'contents' => [],
                         'line_nr' => {},
                         'parent' => {}
                       }
@@ -770,6 +769,11 @@
                   }
                 ],
                 'cmdname' => '"',
+                'line_nr' => {
+                  'file_name' => '',
+                  'line_nr' => 22,
+                  'macro' => ''
+                },
                 'parent' => {}
               },
               {
@@ -805,11 +809,7 @@
           'normalized' => '_00ef',
           'spaces_after_command' => {}
         },
-        'line_nr' => {
-          'file_name' => '',
-          'line_nr' => 22,
-          'macro' => ''
-        },
+        'line_nr' => {},
         'parent' => {}
       },
       {
@@ -842,7 +842,6 @@
                           }
                         ],
                         'cmdname' => 'dotless',
-                        'contents' => [],
                         'line_nr' => {
                           'file_name' => '',
                           'line_nr' => 24,
@@ -856,7 +855,6 @@
                   }
                 ],
                 'cmdname' => '~',
-                'contents' => [],
                 'line_nr' => {},
                 'parent' => {}
               },
@@ -1026,6 +1024,11 @@
                           }
                         ],
                         'cmdname' => '^',
+                        'line_nr' => {
+                          'file_name' => '',
+                          'line_nr' => 30,
+                          'macro' => ''
+                        },
                         'parent' => {}
                       }
                     ],
@@ -1064,11 +1067,7 @@
                     'normalized' => '_00ee'
                   }
                 },
-                'line_nr' => {
-                  'file_name' => '',
-                  'line_nr' => 30,
-                  'macro' => ''
-                },
+                'line_nr' => {},
                 'parent' => {},
                 'type' => 'menu_entry'
               },
@@ -1173,6 +1172,11 @@
                   }
                 ],
                 'cmdname' => '^',
+                'line_nr' => {
+                  'file_name' => '',
+                  'line_nr' => 33,
+                  'macro' => ''
+                },
                 'parent' => {}
               },
               {
@@ -1201,11 +1205,7 @@
           'normalized' => '_00ee',
           'spaces_after_command' => {}
         },
-        'line_nr' => {
-          'file_name' => '',
-          'line_nr' => 33,
-          'macro' => ''
-        },
+        'line_nr' => {},
         'parent' => {}
       }
     ],
@@ -1318,6 +1318,7 @@
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -1361,6 +1362,7 @@
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'extra'}{'node_content'};
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'line_nr'} = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'redirection_same_labels'}[1];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'redirection_same_labels'}[1]{'contents'}[3];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'args'}[0];
@@ -1410,6 +1412,7 @@
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
@@ -1436,6 +1439,7 @@
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'extra'}{'node_content'};
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'line_nr'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'redirection_same_labels'}[2];
 $result_trees{'redirection_same_labels'}[2]{'element_prev'} = 
$result_trees{'redirection_same_labels'}[1];
 $result_trees{'redirection_same_labels'}[2]{'extra'}{'element_command'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1];

Modified: trunk/tp/t/results/html_tests/utf8_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/html_tests/utf8_enable_encoding.pl       2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/html_tests/utf8_enable_encoding.pl       2016-03-28 
10:06:23 UTC (rev 7068)
@@ -74,6 +74,11 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: trunk/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl
===================================================================
--- trunk/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl    
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/html_tests/utf8_enable_encoding_no_use_iso.pl    
2016-03-28 10:06:23 UTC (rev 7068)
@@ -74,6 +74,11 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: trunk/tp/t/results/html_tests/utf8_no_use_entity.pl
===================================================================
--- trunk/tp/t/results/html_tests/utf8_no_use_entity.pl 2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/html_tests/utf8_no_use_entity.pl 2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -74,6 +74,11 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: trunk/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding.pl 
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding.pl 
2016-03-28 10:06:23 UTC (rev 7068)
@@ -74,6 +74,11 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: 
trunk/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl
===================================================================
--- 
trunk/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl  
    2016-03-27 21:15:37 UTC (rev 7067)
+++ 
trunk/tp/t/results/html_tests/utf8_no_use_entity_enable_encoding_no_use_iso.pl  
    2016-03-28 10:06:23 UTC (rev 7068)
@@ -74,6 +74,11 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: trunk/tp/t/results/html_tests/utf8_no_use_entity_no_use_iso.pl
===================================================================
--- trunk/tp/t/results/html_tests/utf8_no_use_entity_no_use_iso.pl      
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/html_tests/utf8_no_use_entity_no_use_iso.pl      
2016-03-28 10:06:23 UTC (rev 7068)
@@ -74,6 +74,11 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: trunk/tp/t/results/indices/def_syn_indices.pl
===================================================================
--- trunk/tp/t/results/indices/def_syn_indices.pl       2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/indices/def_syn_indices.pl       2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -329,6 +329,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -353,7 +354,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {},
                           'parent' => {}
                         }
@@ -363,7 +363,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -1583,6 +1582,7 @@
 
$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4];
+$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/indices/encoding_index_ascii.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_ascii.pl  2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/indices/encoding_index_ascii.pl  2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -215,6 +215,11 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 8,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -235,6 +240,7 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -270,11 +276,7 @@
             'misc_content' => [],
             'spaces_after_command' => {}
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {},
           'type' => 'index_entry_command'
         },
@@ -304,7 +306,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -330,7 +331,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -348,7 +348,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -366,7 +365,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -435,6 +433,11 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 10,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -455,6 +458,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -471,6 +475,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -487,6 +492,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -503,6 +509,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -541,11 +548,7 @@
             'misc_content' => [],
             'spaces_after_command' => {}
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {},
           'type' => 'index_entry_command'
         },
@@ -2241,7 +2244,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 41,
@@ -2267,7 +2269,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2343,7 +2344,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 42,
@@ -2357,7 +2357,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2383,7 +2382,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {},
                           'parent' => {}
                         }
@@ -2393,7 +2391,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -3724,6 +3721,7 @@
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1];
@@ -3735,6 +3733,7 @@
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'misc_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'line_nr'} 
= 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0];
@@ -3776,15 +3775,19 @@
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3];
@@ -3799,6 +3802,7 @@
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'line_nr'} 
= 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'args'}[0];

Modified: trunk/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl  
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl  
2016-03-28 10:06:23 UTC (rev 7068)
@@ -215,6 +215,11 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 8,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -235,6 +240,7 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -270,11 +276,7 @@
             'misc_content' => [],
             'spaces_after_command' => {}
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 8,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {},
           'type' => 'index_entry_command'
         },
@@ -304,7 +306,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -330,7 +331,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -348,7 +348,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -366,7 +365,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -435,6 +433,11 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 10,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -455,6 +458,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -471,6 +475,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -487,6 +492,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -503,6 +509,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -541,11 +548,7 @@
             'misc_content' => [],
             'spaces_after_command' => {}
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {},
           'type' => 'index_entry_command'
         },
@@ -2241,7 +2244,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 41,
@@ -2267,7 +2269,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2343,7 +2344,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 42,
@@ -2357,7 +2357,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2383,7 +2382,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {},
                           'parent' => {}
                         }
@@ -2393,7 +2391,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -3724,6 +3721,7 @@
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1];
@@ -3735,6 +3733,7 @@
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'misc_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0];
@@ -3776,15 +3775,19 @@
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3];
@@ -3799,6 +3802,7 @@
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0];

Modified: trunk/tp/t/results/indices/encoding_index_latin1.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_latin1.pl 2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/indices/encoding_index_latin1.pl 2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -270,7 +270,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -296,7 +295,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -314,7 +312,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -332,7 +329,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -401,6 +397,11 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 10,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -421,6 +422,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -437,6 +439,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -453,6 +456,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -469,6 +473,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -507,11 +512,7 @@
             'misc_content' => [],
             'spaces_after_command' => {}
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {},
           'type' => 'index_entry_command'
         },
@@ -2207,7 +2208,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 41,
@@ -2233,7 +2233,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2309,7 +2308,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 42,
@@ -2323,7 +2321,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2349,7 +2346,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {},
                           'parent' => {}
                         }
@@ -2359,7 +2355,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -3734,15 +3729,19 @@
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3];
@@ -3757,6 +3756,7 @@
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'args'}[0];

Modified: trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
2016-03-28 10:06:23 UTC (rev 7068)
@@ -270,7 +270,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -296,7 +295,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -314,7 +312,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -332,7 +329,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -401,6 +397,11 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 10,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -421,6 +422,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -437,6 +439,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -453,6 +456,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -469,6 +473,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -507,11 +512,7 @@
             'misc_content' => [],
             'spaces_after_command' => {}
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {},
           'type' => 'index_entry_command'
         },
@@ -2207,7 +2208,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 41,
@@ -2233,7 +2233,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2309,7 +2308,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 42,
@@ -2323,7 +2321,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2349,7 +2346,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {},
                           'parent' => {}
                         }
@@ -2359,7 +2355,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -3734,15 +3729,19 @@
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3];
@@ -3757,6 +3756,7 @@
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0];

Modified: trunk/tp/t/results/indices/encoding_index_utf8.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_utf8.pl   2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/indices/encoding_index_utf8.pl   2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -270,7 +270,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -296,7 +295,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -314,7 +312,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -332,7 +329,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -401,6 +397,11 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 10,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -421,6 +422,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -437,6 +439,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -453,6 +456,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -469,6 +473,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -507,11 +512,7 @@
             'misc_content' => [],
             'spaces_after_command' => {}
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {},
           'type' => 'index_entry_command'
         },
@@ -2207,7 +2208,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 41,
@@ -2233,7 +2233,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2309,7 +2308,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 42,
@@ -2323,7 +2321,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2349,7 +2346,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {},
                           'parent' => {}
                         }
@@ -2359,7 +2355,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -3734,15 +3729,19 @@
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3];
@@ -3757,6 +3756,7 @@
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'line_nr'} 
= 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'args'}[0];

Modified: trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl   
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl   
2016-03-28 10:06:23 UTC (rev 7068)
@@ -270,7 +270,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -296,7 +295,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -314,7 +312,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -332,7 +329,6 @@
                     }
                   ],
                   'cmdname' => '"',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -401,6 +397,11 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 10,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -421,6 +422,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -437,6 +439,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -453,6 +456,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -469,6 +473,7 @@
                     }
                   ],
                   'cmdname' => '^',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -507,11 +512,7 @@
             'misc_content' => [],
             'spaces_after_command' => {}
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 10,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {},
           'type' => 'index_entry_command'
         },
@@ -2207,7 +2208,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 41,
@@ -2233,7 +2233,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2309,7 +2308,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 42,
@@ -2323,7 +2321,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -2349,7 +2346,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {},
                           'parent' => {}
                         }
@@ -2359,7 +2355,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -3734,15 +3729,19 @@
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'line_nr'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3];
@@ -3757,6 +3756,7 @@
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'misc_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0];

Modified: trunk/tp/t/results/invalid_nestings/accents.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/accents.pl      2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/invalid_nestings/accents.pl      2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -36,7 +36,6 @@
             }
           ],
           'cmdname' => '~',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 2,
@@ -62,7 +61,6 @@
             }
           ],
           'cmdname' => '~',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -123,7 +121,6 @@
             }
           ],
           'cmdname' => '~',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -175,7 +172,6 @@
             }
           ],
           'cmdname' => '^',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },

Modified: trunk/tp/t/results/itemize/accent_argument.pl
===================================================================
--- trunk/tp/t/results/itemize/accent_argument.pl       2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/itemize/accent_argument.pl       2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -21,6 +21,11 @@
             },
             {
               'cmdname' => '~',
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
+              },
               'parent' => {},
               'type' => 'command_as_argument'
             },
@@ -139,11 +144,7 @@
         'end_command' => {},
         'spaces_after_command' => {}
       },
-      'line_nr' => {
-        'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
-      },
+      'line_nr' => {},
       'parent' => {}
     },
     {
@@ -166,6 +167,11 @@
             },
             {
               'cmdname' => '~',
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 5,
+                'macro' => ''
+              },
               'parent' => {},
               'type' => 'command_as_argument'
             },
@@ -272,11 +278,7 @@
         'end_command' => {},
         'spaces_after_command' => {}
       },
-      'line_nr' => {
-        'file_name' => '',
-        'line_nr' => 5,
-        'macro' => ''
-      },
+      'line_nr' => {},
       'parent' => {}
     }
   ],
@@ -306,6 +308,7 @@
 
$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'command_as_argument'} 
= 
$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
 $result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'end_command'} = 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'spaces_after_command'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'accent_argument'}{'contents'}[0]{'line_nr'} = 
$result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'accent_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'accent_argument'};
 $result_trees{'accent_argument'}{'contents'}[1]{'parent'} = 
$result_trees{'accent_argument'};
 
$result_trees{'accent_argument'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'accent_argument'}{'contents'}[2];
@@ -331,6 +334,7 @@
 
$result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'command_as_argument'} 
= 
$result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0];
 $result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'end_command'} = 
$result_trees{'accent_argument'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'spaces_after_command'}
 = $result_trees{'accent_argument'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'accent_argument'}{'contents'}[2]{'line_nr'} = 
$result_trees{'accent_argument'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'accent_argument'}{'contents'}[2]{'parent'} = 
$result_trees{'accent_argument'};
 
 $result_texis{'accent_argument'} = '@itemize @address@hidden

Modified: trunk/tp/t/results/macro/macro_in_accent.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_accent.pl 2016-03-27 21:15:37 UTC (rev 
7067)
+++ trunk/tp/t/results/macro/macro_in_accent.pl 2016-03-28 10:06:23 UTC (rev 
7068)
@@ -128,6 +128,11 @@
           'extra' => {
             'spaces' => ' '
           },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 9,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -149,6 +154,11 @@
             }
           ],
           'cmdname' => 'ringaccent',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 10,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -170,6 +180,11 @@
             }
           ],
           'cmdname' => '~',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 11,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -191,7 +206,6 @@
             }
           ],
           'cmdname' => '~',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 12,
@@ -233,6 +247,11 @@
           'extra' => {
             'spaces' => '  '
           },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 14,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: trunk/tp/t/results/macro/macro_in_index_commands.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_index_commands.pl 2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/macro/macro_in_index_commands.pl 2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -710,6 +710,7 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -734,7 +735,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {},
                           'parent' => {}
                         }
@@ -744,7 +744,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -1171,6 +1170,7 @@
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/misc_commands/invalid_documentencoding.pl
===================================================================
--- trunk/tp/t/results/misc_commands/invalid_documentencoding.pl        
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/misc_commands/invalid_documentencoding.pl        
2016-03-28 10:06:23 UTC (rev 7068)
@@ -428,6 +428,11 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 11,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -446,11 +451,7 @@
             'spaces_after_command' => {},
             'text_arg' => 'BBBe\''
           },
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 11,
-            'macro' => ''
-          },
+          'line_nr' => {},
           'parent' => {}
         }
       ],
@@ -539,6 +540,7 @@
 
$result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'args'}[0];
 
$result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7];
 
$result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'line_nr'}
 = 
$result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'invalid_documentencoding'}{'contents'}[5]{'contents'}[7]{'parent'}
 = $result_trees{'invalid_documentencoding'}{'contents'}[5];
 $result_trees{'invalid_documentencoding'}{'contents'}[5]{'parent'} = 
$result_trees{'invalid_documentencoding'};
 

Modified: trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
===================================================================
--- trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl    2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl    2016-03-28 
10:06:23 UTC (rev 7068)
@@ -476,6 +476,11 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {
+                        'file_name' => '',
+                        'line_nr' => 20,
+                        'macro' => 'testallowcodebreakspara'
+                      },
                       'parent' => {}
                     },
                     {
@@ -497,11 +502,7 @@
                       ],
                       'cmdname' => 'r',
                       'contents' => [],
-                      'line_nr' => {
-                        'file_name' => '',
-                        'line_nr' => 20,
-                        'macro' => 'testallowcodebreakspara'
-                      },
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -983,6 +984,11 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {
+                        'file_name' => '',
+                        'line_nr' => 25,
+                        'macro' => 'testallowcodebreakspara'
+                      },
                       'parent' => {}
                     },
                     {
@@ -1004,11 +1010,7 @@
                       ],
                       'cmdname' => 'r',
                       'contents' => [],
-                      'line_nr' => {
-                        'file_name' => '',
-                        'line_nr' => 25,
-                        'macro' => 'testallowcodebreakspara'
-                      },
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -1453,6 +1455,11 @@
                                 }
                               ],
                               'cmdname' => '\'',
+                              'line_nr' => {
+                                'file_name' => '',
+                                'line_nr' => 29,
+                                'macro' => 'testallowcodebreakspara'
+                              },
                               'parent' => {}
                             },
                             {
@@ -1474,11 +1481,7 @@
                               ],
                               'cmdname' => 'r',
                               'contents' => [],
-                              'line_nr' => {
-                                'file_name' => '',
-                                'line_nr' => 29,
-                                'macro' => 'testallowcodebreakspara'
-                              },
+                              'line_nr' => {},
                               'parent' => {}
                             },
                             {
@@ -1993,6 +1996,11 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {
+                        'file_name' => '',
+                        'line_nr' => 38,
+                        'macro' => 'testallowcodebreakspara'
+                      },
                       'parent' => {}
                     },
                     {
@@ -2014,11 +2022,7 @@
                       ],
                       'cmdname' => 'r',
                       'contents' => [],
-                      'line_nr' => {
-                        'file_name' => '',
-                        'line_nr' => 38,
-                        'macro' => 'testallowcodebreakspara'
-                      },
+                      'line_nr' => {},
                       'parent' => {}
                     },
                     {
@@ -2300,6 +2304,7 @@
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5];
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'};
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
@@ -2309,7 +2314,7 @@
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'};
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'};
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[20]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'contents'}[21]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[7]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
@@ -2394,6 +2399,7 @@
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5];
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'};
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
@@ -2403,7 +2409,7 @@
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'};
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'};
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[20]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'contents'}[21]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[12]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
@@ -2481,6 +2487,7 @@
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5];
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[3]{'line_nr'};
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
@@ -2490,7 +2497,7 @@
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[5]{'line_nr'};
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[3]{'line_nr'};
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[1];
@@ -2581,6 +2588,7 @@
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5];
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'};
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
@@ -2590,7 +2598,7 @@
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[5]{'line_nr'};
+$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'line_nr'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'args'}[0]{'contents'}[3]{'line_nr'};
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[20]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'contents'}[21]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[21]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];

Modified: trunk/tp/t/results/paragraph/paragraph_command.pl
===================================================================
--- trunk/tp/t/results/paragraph/paragraph_command.pl   2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/paragraph/paragraph_command.pl   2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -83,7 +83,6 @@
             }
           ],
           'cmdname' => 'dotless',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 5,

Modified: trunk/tp/t/results/plaintext_tests/accent_command_punctuation.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/accent_command_punctuation.pl    
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/plaintext_tests/accent_command_punctuation.pl    
2016-03-28 10:06:23 UTC (rev 7068)
@@ -23,7 +23,6 @@
             }
           ],
           'cmdname' => 'dotaccent',
-          'contents' => [],
           'line_nr' => {
             'file_name' => '',
             'line_nr' => 1,

Modified: trunk/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl        
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl        
2016-03-28 10:06:23 UTC (rev 7068)
@@ -78,6 +78,11 @@
                     }
                   ],
                   'cmdname' => ',',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 3,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -98,12 +103,7 @@
                     }
                   ],
                   'cmdname' => 'u',
-                  'contents' => [],
-                  'line_nr' => {
-                    'file_name' => '',
-                    'line_nr' => 3,
-                    'macro' => ''
-                  },
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -124,6 +124,7 @@
                     }
                   ],
                   'cmdname' => '`',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -163,13 +164,15 @@
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0];
-$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'};
+$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2];
 
$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2];
 $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'parent'} = 
$result_trees{'accents_in_var_enable_encoding'};

Modified: trunk/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl  
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl  
2016-03-28 10:06:23 UTC (rev 7068)
@@ -363,7 +363,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 10,
@@ -377,7 +376,6 @@
                 }
               ],
               'cmdname' => '^',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },

Modified: trunk/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl        
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl        
2016-03-28 10:06:23 UTC (rev 7068)
@@ -351,7 +351,6 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -365,7 +364,6 @@
             }
           ],
           'cmdname' => '^',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },

Modified: trunk/tp/t/results/plaintext_tests/before_accent_punctuation.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/before_accent_punctuation.pl     
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/plaintext_tests/before_accent_punctuation.pl     
2016-03-28 10:06:23 UTC (rev 7068)
@@ -27,6 +27,11 @@
             }
           ],
           'cmdname' => '^',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          },
           'parent' => {}
         }
       ],

Modified: trunk/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl        
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl        
2016-03-28 10:06:23 UTC (rev 7068)
@@ -197,6 +197,11 @@
                     }
                   ],
                   'cmdname' => ',',
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 6,
+                    'macro' => ''
+                  },
                   'parent' => {}
                 },
                 {
@@ -217,12 +222,7 @@
                     }
                   ],
                   'cmdname' => 'u',
-                  'contents' => [],
-                  'line_nr' => {
-                    'file_name' => '',
-                    'line_nr' => 6,
-                    'macro' => ''
-                  },
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -243,6 +243,7 @@
                     }
                   ],
                   'cmdname' => '`',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -417,16 +418,18 @@
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7];
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0];
-$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'};
+$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'characters_and_commands_in_var'}{'contents'}[4];
 
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'characters_and_commands_in_var'}{'contents'}[4];
 $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'parent'} = 
$result_trees{'characters_and_commands_in_var'};

Modified: trunk/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl    
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl    
2016-03-28 10:06:23 UTC (rev 7068)
@@ -15,7 +15,11 @@
         },
         {
           'cmdname' => '^',
-          'contents' => [],
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: 
trunk/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl   
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl   
2016-03-28 10:06:23 UTC (rev 7068)
@@ -53,6 +53,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -144,6 +145,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -239,6 +241,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -303,6 +306,7 @@
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'};
@@ -320,6 +324,7 @@
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[6]{'line_nr'};
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[6]{'line_nr'};
@@ -338,6 +343,7 @@
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1];
+$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[12]{'line_nr'};
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14];
 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[12]{'line_nr'};

Modified: 
trunk/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl
===================================================================
--- 
trunk/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl  
    2016-03-27 21:15:37 UTC (rev 7067)
+++ 
trunk/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl  
    2016-03-28 10:06:23 UTC (rev 7068)
@@ -94,6 +94,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -185,6 +186,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -280,6 +282,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -351,6 +354,7 @@
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'};
@@ -368,6 +372,7 @@
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'};
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'};
@@ -386,6 +391,7 @@
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1];
+$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'};
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14];
 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'line_nr'}
 = 
$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'};

Modified: 
trunk/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl   
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl   
2016-03-28 10:06:23 UTC (rev 7068)
@@ -59,6 +59,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -150,6 +151,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -245,6 +247,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -352,6 +355,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -443,6 +447,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -538,6 +543,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -603,6 +609,7 @@
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[0]{'line_nr'};
@@ -620,6 +627,7 @@
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[6]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[6]{'line_nr'};
@@ -638,6 +646,7 @@
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1];
+$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[12]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[12]{'line_nr'};
@@ -658,6 +667,7 @@
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'};
@@ -675,6 +685,7 @@
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[7]{'parent'}
 = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[6]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[6]{'line_nr'};
@@ -693,6 +704,7 @@
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1];
+$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[12]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14];
 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[12]{'line_nr'};

Modified: 
trunk/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl
===================================================================
--- 
trunk/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl  
    2016-03-27 21:15:37 UTC (rev 7067)
+++ 
trunk/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl  
    2016-03-28 10:06:23 UTC (rev 7068)
@@ -94,6 +94,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -185,6 +186,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -280,6 +282,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -387,6 +390,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -478,6 +482,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -573,6 +578,7 @@
                     }
                   ],
                   'cmdname' => '~',
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -644,6 +650,7 @@
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'};
@@ -661,6 +668,7 @@
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'};
@@ -679,6 +687,7 @@
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1];
+$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'};
@@ -699,6 +708,7 @@
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[0]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[0]{'line_nr'};
@@ -716,6 +726,7 @@
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[7]{'parent'}
 = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[6]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[6]{'line_nr'};
@@ -734,6 +745,7 @@
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1];
+$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[12]{'line_nr'};
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14];
 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'line_nr'}
 = 
$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[12]{'line_nr'};

Modified: trunk/tp/t/results/sectioning/at_commands_in_node.pl
===================================================================
--- trunk/tp/t/results/sectioning/at_commands_in_node.pl        2016-03-27 
21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/sectioning/at_commands_in_node.pl        2016-03-28 
10:06:23 UTC (rev 7068)
@@ -68,6 +68,7 @@
                 }
               ],
               'cmdname' => '"',
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -92,7 +93,6 @@
                         }
                       ],
                       'cmdname' => 'dotless',
-                      'contents' => [],
                       'line_nr' => {},
                       'parent' => {}
                     }
@@ -102,7 +102,6 @@
                 }
               ],
               'cmdname' => '"',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -128,6 +127,7 @@
                         }
                       ],
                       'cmdname' => '=',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -136,7 +136,6 @@
                 }
               ],
               'cmdname' => '`',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -178,6 +177,7 @@
                         }
                       ],
                       'cmdname' => '\'',
+                      'line_nr' => {},
                       'parent' => {}
                     }
                   ],
@@ -186,7 +186,6 @@
                 }
               ],
               'cmdname' => ',',
-              'contents' => [],
               'line_nr' => {},
               'parent' => {}
             },
@@ -255,6 +254,7 @@
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -267,6 +267,7 @@
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8]{'line_nr'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
@@ -277,6 +278,7 @@
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12]{'line_nr'}
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};

Modified: trunk/tp/t/results/sectioning/node.pl
===================================================================
--- trunk/tp/t/results/sectioning/node.pl       2016-03-27 21:15:37 UTC (rev 
7067)
+++ trunk/tp/t/results/sectioning/node.pl       2016-03-28 10:06:23 UTC (rev 
7068)
@@ -580,6 +580,11 @@
                 }
               ],
               'cmdname' => ',',
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 10,
+                'macro' => ''
+              },
               'parent' => {}
             },
             {
@@ -611,11 +616,7 @@
               ],
               'cmdname' => 'strong',
               'contents' => [],
-              'line_nr' => {
-                'file_name' => '',
-                'line_nr' => 10,
-                'macro' => ''
-              },
+              'line_nr' => {},
               'parent' => {}
             },
             {
@@ -783,6 +784,7 @@
 $result_trees{'node'}{'contents'}[7]{'args'}[1]{'parent'} = 
$result_trees{'node'}{'contents'}[7];
 
$result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1];
+$result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'line_nr'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'line_nr'};
 $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[2];
 $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[2];
 
$result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[3];
@@ -796,7 +798,7 @@
 
$result_trees{'node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[1]{'node_content'}[1]
 = $result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[2];
 
$result_trees{'node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1];
 $result_trees{'node'}{'contents'}[7]{'extra'}{'spaces_after_command'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'node'}{'contents'}[7]{'line_nr'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[2]{'contents'}[1]{'line_nr'};
+$result_trees{'node'}{'contents'}[7]{'line_nr'} = 
$result_trees{'node'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'line_nr'};
 $result_trees{'node'}{'contents'}[7]{'parent'} = $result_trees{'node'};
 
 $result_texis{'node'} = '

Modified: trunk/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
===================================================================
--- trunk/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl      
2016-03-27 21:15:37 UTC (rev 7067)
+++ trunk/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl      
2016-03-28 10:06:23 UTC (rev 7068)
@@ -83,6 +83,11 @@
                           }
                         ],
                         'cmdname' => '~',
+                        'line_nr' => {
+                          'file_name' => '',
+                          'line_nr' => 4,
+                          'macro' => ''
+                        },
                         'parent' => {}
                       }
                     ],
@@ -121,11 +126,7 @@
                     'normalized' => '_00e3'
                   }
                 },
-                'line_nr' => {
-                  'file_name' => '',
-                  'line_nr' => 4,
-                  'macro' => ''
-                },
+                'line_nr' => {},
                 'parent' => {},
                 'type' => 'menu_entry'
               },
@@ -209,6 +210,11 @@
                           }
                         ],
                         'cmdname' => '^',
+                        'line_nr' => {
+                          'file_name' => '',
+                          'line_nr' => 6,
+                          'macro' => ''
+                        },
                         'parent' => {}
                       }
                     ],
@@ -247,11 +253,7 @@
                     'normalized' => '_00e2'
                   }
                 },
-                'line_nr' => {
-                  'file_name' => '',
-                  'line_nr' => 6,
-                  'macro' => ''
-                },
+                'line_nr' => {},
                 'parent' => {},
                 'type' => 'menu_entry'
               },
@@ -370,6 +372,11 @@
                   }
                 ],
                 'cmdname' => '~',
+                'line_nr' => {
+                  'file_name' => '',
+                  'line_nr' => 9,
+                  'macro' => ''
+                },
                 'parent' => {}
               },
               {
@@ -405,11 +412,7 @@
           'normalized' => '_00e3',
           'spaces_after_command' => {}
         },
-        'line_nr' => {
-          'file_name' => '',
-          'line_nr' => 9,
-          'macro' => ''
-        },
+        'line_nr' => {},
         'parent' => {}
       }
     ],
@@ -514,6 +517,11 @@
                   }
                 ],
                 'cmdname' => '^',
+                'line_nr' => {
+                  'file_name' => '',
+                  'line_nr' => 13,
+                  'macro' => ''
+                },
                 'parent' => {}
               },
               {
@@ -542,11 +550,7 @@
           'normalized' => '_00e2',
           'spaces_after_command' => {}
         },
-        'line_nr' => {
-          'file_name' => '',
-          'line_nr' => 13,
-          'macro' => ''
-        },
+        'line_nr' => {},
         'parent' => {}
       }
     ],
@@ -578,6 +582,7 @@
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1];
@@ -600,6 +605,7 @@
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'line_nr'};
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[4];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
@@ -630,6 +636,7 @@
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'}{'node_content'};
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[1];
 $result_trees{'transliterated_split_equivalent_nodes'}[1]{'element_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'extra'}{'element_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0];
@@ -657,6 +664,7 @@
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'node_content'};
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[3];
 $result_trees{'transliterated_split_equivalent_nodes'}[3]{'element_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[2];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'extra'}{'element_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0];

Modified: trunk/tp/t/results/test_count/commands.pl
===================================================================
--- trunk/tp/t/results/test_count/commands.pl   2016-03-27 21:15:37 UTC (rev 
7067)
+++ trunk/tp/t/results/test_count/commands.pl   2016-03-28 10:06:23 UTC (rev 
7068)
@@ -52,6 +52,11 @@
             }
           ],
           'cmdname' => '~',
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 2,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -76,12 +81,7 @@
                     }
                   ],
                   'cmdname' => 'dotless',
-                  'contents' => [],
-                  'line_nr' => {
-                    'file_name' => '',
-                    'line_nr' => 2,
-                    'macro' => ''
-                  },
+                  'line_nr' => {},
                   'parent' => {}
                 }
               ],
@@ -90,7 +90,6 @@
             }
           ],
           'cmdname' => '^',
-          'contents' => [],
           'line_nr' => {},
           'parent' => {}
         },
@@ -481,9 +480,10 @@
 $result_trees{'commands'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'line_nr'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'line_nr'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'line_nr'};
 $result_trees{'commands'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 $result_trees{'commands'}{'contents'}[0]{'parent'} = $result_trees{'commands'};

Modified: trunk/tp/t/results/value/value_after_accent.pl
===================================================================
--- trunk/tp/t/results/value/value_after_accent.pl      2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/value/value_after_accent.pl      2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -35,10 +35,14 @@
       'contents' => [
         {
           'cmdname' => 'ringaccent',
-          'contents' => [],
           'extra' => {
             'spaces' => ' '
           },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 2,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {
@@ -48,7 +52,11 @@
         },
         {
           'cmdname' => '~',
-          'contents' => [],
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
           'parent' => {}
         },
         {

Modified: trunk/tp/t/results/value/value_in_index_commands.pl
===================================================================
--- trunk/tp/t/results/value/value_in_index_commands.pl 2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/value/value_in_index_commands.pl 2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -563,6 +563,7 @@
                     }
                   ],
                   'cmdname' => '\'',
+                  'line_nr' => {},
                   'parent' => {}
                 },
                 {
@@ -587,7 +588,6 @@
                             }
                           ],
                           'cmdname' => 'dotless',
-                          'contents' => [],
                           'line_nr' => {},
                           'parent' => {}
                         }
@@ -597,7 +597,6 @@
                     }
                   ],
                   'cmdname' => '^',
-                  'contents' => [],
                   'line_nr' => {},
                   'parent' => {}
                 },
@@ -986,6 +985,7 @@
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];

Modified: trunk/tp/t/results/xtable/accent_on_table_line.pl
===================================================================
--- trunk/tp/t/results/xtable/accent_on_table_line.pl   2016-03-27 21:15:37 UTC 
(rev 7067)
+++ trunk/tp/t/results/xtable/accent_on_table_line.pl   2016-03-28 10:06:23 UTC 
(rev 7068)
@@ -21,6 +21,11 @@
             },
             {
               'cmdname' => '~',
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 1,
+                'macro' => ''
+              },
               'parent' => {},
               'type' => 'command_as_argument'
             },
@@ -218,11 +223,7 @@
         'end_command' => {},
         'spaces_after_command' => {}
       },
-      'line_nr' => {
-        'file_name' => '',
-        'line_nr' => 1,
-        'macro' => ''
-      },
+      'line_nr' => {},
       'parent' => {}
     }
   ],
@@ -270,6 +271,7 @@
 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
 $result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'end_command'} = 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'line_nr'} = 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
 $result_trees{'accent_on_table_line'}{'contents'}[0]{'parent'} = 
$result_trees{'accent_on_table_line'};
 
 $result_texis{'accent_on_table_line'} = '@table @~