diff options
Diffstat (limited to 'macros/texinfo/texinfo/tp/t/results/xml_tests')
13 files changed, 869 insertions, 144 deletions
diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl index 59836bcd05..5535354b22 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl @@ -358,6 +358,9 @@ a $result_errors{'brace_commands_spaces_end_of_lines'} = []; +$result_floats{'brace_commands_spaces_end_of_lines'} = {}; + + $result_converted{'xml'}->{'brace_commands_spaces_end_of_lines'} = '<image><imagefile spaces="\\n">a</imagefile></image> diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl index 45851d3774..b64cf98d74 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl @@ -794,7 +794,9 @@ $result_trees{'commands_and_spaces'} = { 'shortcaption' => {}, 'spaces_before_argument' => ' ', 'type' => { - 'content' => [], + 'content' => [ + {} + ], 'normalized' => 'ff' } }, @@ -892,7 +894,11 @@ $result_trees{'commands_and_spaces'} = { 'max_columns' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 36, + 'macro' => '' + }, 'parent' => {} }, { @@ -1009,11 +1015,15 @@ $result_trees{'commands_and_spaces'} = { 'max_columns' => 5, 'prototypes' => [ { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' }, { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' }, { @@ -1064,7 +1074,11 @@ $result_trees{'commands_and_spaces'} = { ], 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 39, + 'macro' => '' + }, 'parent' => {} }, { @@ -1354,7 +1368,11 @@ $result_trees{'commands_and_spaces'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 54, + 'macro' => '' + }, 'parent' => {} }, { @@ -1458,7 +1476,11 @@ $result_trees{'commands_and_spaces'} = { 'extra' => { 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 60, + 'macro' => '' + }, 'parent' => {} }, { @@ -1566,7 +1588,11 @@ $result_trees{'commands_and_spaces'} = { 'spaces_after_argument' => ' ', 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 64, + 'macro' => '' + }, 'parent' => {}, 'type' => 'bracketed_def_content' }, @@ -1590,7 +1616,11 @@ $result_trees{'commands_and_spaces'} = { 'spaces_after_argument' => ' ', 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 64, + 'macro' => '' + }, 'parent' => {}, 'type' => 'bracketed_def_content' }, @@ -1614,7 +1644,11 @@ $result_trees{'commands_and_spaces'} = { 'spaces_after_argument' => ' ', 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 64, + 'macro' => '' + }, 'parent' => {}, 'type' => 'bracketed_def_content' }, @@ -1638,7 +1672,11 @@ $result_trees{'commands_and_spaces'} = { 'spaces_after_argument' => ' ', 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 64, + 'macro' => '' + }, 'parent' => {}, 'type' => 'bracketed_def_content' }, @@ -1680,7 +1718,11 @@ $result_trees{'commands_and_spaces'} = { }, 'original_def_cmdname' => 'deffn' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 64, + 'macro' => '' + }, 'parent' => {}, 'type' => 'def_line' }, @@ -1736,7 +1778,11 @@ $result_trees{'commands_and_spaces'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 64, + 'macro' => '' + }, 'parent' => {} }, { @@ -1752,7 +1798,9 @@ $result_trees{'commands_and_spaces'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'a' }, { @@ -1899,7 +1947,7 @@ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'ca $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'end_command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[5]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'node_content'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[1]{'contents'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'shortcaption'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[3]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'type'}{'content'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}; +$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'type'}{'content'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[24]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]{'args'}[0]; @@ -1911,7 +1959,6 @@ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'columnfractions'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'end_command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[26]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]; @@ -1929,12 +1976,11 @@ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'end_command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]{'contents'}; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[2]{'contents'}; +$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[1]{'contents'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[2]{'contents'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[2] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[2]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[4] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[4]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[4]{'line_nr'}; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[28]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'extra'}{'command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]; @@ -1975,7 +2021,6 @@ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'command_as_argument'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'end_command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[37]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]; @@ -1992,7 +2037,6 @@ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; @@ -2007,19 +2051,15 @@ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[8]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]; @@ -2029,7 +2069,6 @@ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'node'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[1]; @@ -2038,11 +2077,10 @@ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[ $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[2]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'extra'}{'end_command'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[2]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'line_nr'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[45]{'parent'} = $result_trees{'commands_and_spaces'}{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[1]{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2]{'contents'}[1]; $result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0] = $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3]{'contents'}[1]; diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_end_lines.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_end_lines.pl index ec22d90747..fa52276135 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_end_lines.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_end_lines.pl @@ -180,7 +180,7 @@ $result_trees{'comments_end_lines'} = { ], 'extra' => { 'end_command' => {}, - 'enumerate_specification' => 1 + 'enumerate_specification' => '1' }, 'line_nr' => { 'file_name' => '', @@ -314,7 +314,11 @@ $result_trees{'comments_end_lines'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} }, { @@ -675,7 +679,11 @@ $result_trees{'comments_end_lines'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 25, + 'macro' => '' + }, 'parent' => {} } ], @@ -743,7 +751,11 @@ $result_trees{'comments_end_lines'} = { 'max_columns' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => '' + }, 'parent' => {} }, { @@ -848,7 +860,9 @@ $result_trees{'comments_end_lines'} = { 'normalized' => 'g', 'spaces_before_argument' => ' ', 'type' => { - 'content' => [], + 'content' => [ + {} + ], 'normalized' => 'f' } }, @@ -1076,7 +1090,6 @@ $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'pa $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'comments_end_lines'}{'contents'}[4]; $result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'command_as_argument'} = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0]; $result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]; -$result_trees{'comments_end_lines'}{'contents'}[4]{'line_nr'} = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'comments_end_lines'}{'contents'}[4]{'parent'} = $result_trees{'comments_end_lines'}; $result_trees{'comments_end_lines'}{'contents'}[5]{'parent'} = $result_trees{'comments_end_lines'}; $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'comments_end_lines'}{'contents'}[6]; @@ -1124,7 +1137,6 @@ $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0 $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]; $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]; -$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]; $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]; $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'parent'} = $result_trees{'comments_end_lines'}{'contents'}[12]; @@ -1135,7 +1147,6 @@ $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'p $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'parent'} = $result_trees{'comments_end_lines'}{'contents'}[12]; $result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'columnfractions'} = $result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]; $result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'end_command'} = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]; -$result_trees{'comments_end_lines'}{'contents'}[12]{'line_nr'} = $result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'comments_end_lines'}{'contents'}[12]{'parent'} = $result_trees{'comments_end_lines'}; $result_trees{'comments_end_lines'}{'contents'}[13]{'parent'} = $result_trees{'comments_end_lines'}; $result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]; @@ -1151,7 +1162,7 @@ $result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'p $result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'parent'} = $result_trees{'comments_end_lines'}{'contents'}[14]; $result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'end_command'} = $result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]; $result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'node_content'}[0] = $result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[1]{'contents'}[0]; -$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'type'}{'content'} = $result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'contents'}; +$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'type'}{'content'}[0] = $result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'contents'}[0]; $result_trees{'comments_end_lines'}{'contents'}[14]{'parent'} = $result_trees{'comments_end_lines'}; $result_trees{'comments_end_lines'}{'contents'}[15]{'parent'} = $result_trees{'comments_end_lines'}; $result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[0]{'extra'}{'command'} = $result_trees{'comments_end_lines'}{'contents'}[16]; diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl index 353ced2c9a..258126d526 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl @@ -333,7 +333,11 @@ $result_trees{'comments_on_block_command_lines'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => '' + }, 'parent' => {} }, { @@ -454,7 +458,11 @@ $result_trees{'comments_on_block_command_lines'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 13, + 'macro' => '' + }, 'parent' => {} }, { @@ -552,7 +560,7 @@ $result_trees{'comments_on_block_command_lines'} = { ], 'extra' => { 'end_command' => {}, - 'enumerate_specification' => 1, + 'enumerate_specification' => '1', 'spaces_before_argument' => ' ' }, 'line_nr' => { @@ -798,7 +806,11 @@ $result_trees{'comments_on_block_command_lines'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 25, + 'macro' => '' + }, 'parent' => {} }, { @@ -1174,6 +1186,475 @@ $result_trees{'comments_on_block_command_lines'} = { { 'contents' => [ { + 'parent' => {}, + 'text' => 'in ' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'first' + } + ], + 'parent' => {}, + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'code', + 'contents' => [], + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 45, + 'macro' => '' + }, + 'parent' => {} + }, + { + 'parent' => {}, + 'text' => ' arg' + } + ], + 'parent' => {}, + 'type' => 'block_line_arg' + }, + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'second arg' + } + ], + 'extra' => { + 'comment_at_end' => { + 'args' => [ + { + 'parent' => {}, + 'text' => ' comm +', + 'type' => 'misc_arg' + } + ], + 'cmdname' => 'c', + 'extra' => { + 'misc_args' => [ + ' comm +' + ] + }, + 'parent' => {} + }, + 'spaces_after_argument' => ' ', + 'spaces_before_argument' => ' ' + }, + 'parent' => {}, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'example', + 'contents' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'in ex with arg +' + } + ], + 'parent' => {}, + 'type' => 'preformatted' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'example' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'example', + 'spaces_before_argument' => ' ', + 'text_arg' => 'example' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 47, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'end_command' => {}, + 'spaces_before_argument' => ' ' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 45, + 'macro' => '' + }, + 'parent' => {} + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'first' + } + ], + 'parent' => {}, + 'type' => 'block_line_arg' + }, + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'second' + } + ], + 'extra' => { + 'spaces_before_argument' => ' ' + }, + 'parent' => {}, + 'type' => 'block_line_arg' + }, + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'third' + } + ], + 'extra' => { + 'comment_at_end' => { + 'args' => [ + { + 'parent' => {}, + 'text' => ' comm +', + 'type' => 'misc_arg' + } + ], + 'cmdname' => 'c', + 'extra' => { + 'misc_args' => [ + ' comm +' + ] + }, + 'parent' => {} + }, + 'spaces_after_argument' => ' ', + 'spaces_before_argument' => ' ' + }, + 'parent' => {}, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'example', + 'contents' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'in ex 3 args +' + } + ], + 'parent' => {}, + 'type' => 'preformatted' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'example' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'example', + 'spaces_before_argument' => ' ', + 'text_arg' => 'example' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 51, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'end_command' => {}, + 'spaces_before_argument' => ' ' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 49, + 'macro' => '' + }, + 'parent' => {} + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'first' + } + ], + 'parent' => {}, + 'type' => 'block_line_arg' + }, + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'second' + } + ], + 'parent' => {}, + 'type' => 'block_line_arg' + }, + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'third' + } + ], + 'extra' => { + 'spaces_before_argument' => ' ' + }, + 'parent' => {}, + 'type' => 'block_line_arg' + }, + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'fourth' + } + ], + 'extra' => { + 'comment_at_end' => { + 'args' => [ + { + 'parent' => {}, + 'text' => ' comm +', + 'type' => 'misc_arg' + } + ], + 'cmdname' => 'c', + 'extra' => { + 'misc_args' => [ + ' comm +' + ] + }, + 'parent' => {} + }, + 'spaces_after_argument' => ' ', + 'spaces_before_argument' => ' ' + }, + 'parent' => {}, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'example', + 'contents' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'in ex 4 args +' + } + ], + 'parent' => {}, + 'type' => 'preformatted' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'example' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'example', + 'spaces_before_argument' => ' ', + 'text_arg' => 'example' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 55, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'end_command' => {}, + 'spaces_before_argument' => ' ' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 53, + 'macro' => '' + }, + 'parent' => {} + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [], + 'extra' => { + 'comment_at_end' => { + 'args' => [ + { + 'parent' => {}, + 'text' => ' comm +', + 'type' => 'misc_arg' + } + ], + 'cmdname' => 'c', + 'extra' => { + 'misc_args' => [ + ' comm +' + ] + }, + 'parent' => {} + } + }, + 'parent' => {}, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'display', + 'contents' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'in display +' + } + ], + 'parent' => {}, + 'type' => 'preformatted' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'display' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'display', + 'spaces_before_argument' => ' ', + 'text_arg' => 'display' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 59, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'end_command' => {}, + 'spaces_before_argument' => ' ' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 57, + 'macro' => '' + }, + 'parent' => {} + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [ + { 'args' => [ { 'contents' => [ @@ -1217,7 +1698,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 45, + 'line_nr' => 61, 'macro' => '' }, 'parent' => {} @@ -1253,7 +1734,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 46, + 'line_nr' => 62, 'macro' => '' }, 'parent' => {} @@ -1277,7 +1758,11 @@ $result_trees{'comments_on_block_command_lines'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 62, + 'macro' => '' + }, 'parent' => {} } ], @@ -1316,7 +1801,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 47, + 'line_nr' => 63, 'macro' => '' }, 'parent' => {} @@ -1328,7 +1813,11 @@ $result_trees{'comments_on_block_command_lines'} = { 'max_columns' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 61, + 'macro' => '' + }, 'parent' => {} }, { @@ -1417,7 +1906,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 50, + 'line_nr' => 66, 'macro' => '' }, 'parent' => {} @@ -1441,7 +1930,11 @@ $result_trees{'comments_on_block_command_lines'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 66, + 'macro' => '' + }, 'parent' => {} } ], @@ -1480,7 +1973,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 51, + 'line_nr' => 67, 'macro' => '' }, 'parent' => {} @@ -1491,11 +1984,15 @@ $result_trees{'comments_on_block_command_lines'} = { 'max_columns' => 2, 'prototypes' => [ { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' }, { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' } ], @@ -1511,7 +2008,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 49, + 'line_nr' => 65, 'macro' => '' }, 'parent' => {} @@ -1604,7 +2101,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 55, + 'line_nr' => 71, 'macro' => '' }, 'parent' => {} @@ -1618,13 +2115,15 @@ $result_trees{'comments_on_block_command_lines'} = { 'normalized' => 'g', 'spaces_before_argument' => ' ', 'type' => { - 'content' => [], + 'content' => [ + {} + ], 'normalized' => 'f' } }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 53, + 'line_nr' => 69, 'macro' => '' }, 'number' => 1, @@ -1702,7 +2201,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 59, + 'line_nr' => 75, 'macro' => '' }, 'parent' => {} @@ -1714,7 +2213,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 57, + 'line_nr' => 73, 'macro' => '' }, 'parent' => {} @@ -1791,7 +2290,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 63, + 'line_nr' => 79, 'macro' => '' }, 'parent' => {} @@ -1803,7 +2302,7 @@ $result_trees{'comments_on_block_command_lines'} = { }, 'line_nr' => { 'file_name' => '', - 'line_nr' => 61, + 'line_nr' => 77, 'macro' => '' }, 'parent' => {} @@ -1856,7 +2355,6 @@ $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[1]{' $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]; $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'extra'}{'command_as_argument'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'contents'}[1]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'line_nr'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[4]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[5]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0]; @@ -1872,7 +2370,6 @@ $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[1]{' $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]; $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'extra'}{'command_as_argument'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'contents'}[1]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'line_nr'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[6]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[7]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[8]{'args'}[0]{'extra'}{'comment_at_end'}; @@ -1914,7 +2411,6 @@ $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[1]{ $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]; $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'extra'}{'command_as_argument'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'contents'}[1]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'line_nr'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[12]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[13]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'args'}[0]{'extra'}{'comment_at_end'}; @@ -1962,70 +2458,56 @@ $result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[1]{ $result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'contents'}[1]; $result_trees{'comments_on_block_command_lines'}{'contents'}[20]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[21]{'parent'} = $result_trees{'comments_on_block_command_lines'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[1]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[1]{'extra'}{'comment_at_end'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[1]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]; $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]; $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1]{'args'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1]; $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'columnfractions'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'contents'}[1]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'line_nr'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[23]{'parent'} = $result_trees{'comments_on_block_command_lines'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[2]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'extra'}{'comment_at_end'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[1]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[2]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[2]{'extra'}{'comment_at_end'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[2]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[2]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[2]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]; $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]; $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]{'args'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]; $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]; $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'contents'}[1]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[0]{'contents'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[2]{'contents'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes_line'}[0] = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'prototypes_line'}[2] = $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[2]; $result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[25]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'extra'}{'comment_at_end'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[2]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[2]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[3]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[3]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[3]{'extra'}{'comment_at_end'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[3]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[3]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[3]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'node_content'}[0] = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[1]{'contents'}[0]; -$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'type'}{'content'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[27]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'extra'}{'comment_at_end'}; @@ -2039,17 +2521,91 @@ $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{ $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]; $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[29]{'parent'} = $result_trees{'comments_on_block_command_lines'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'extra'}{'comment_at_end'}; -$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]; $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]{'args'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]; $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'extra'}{'columnfractions'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'args'}[0]{'contents'}[0]; $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'contents'}[1]; $result_trees{'comments_on_block_command_lines'}{'contents'}[30]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_trees{'comments_on_block_command_lines'}{'contents'}[31]{'parent'} = $result_trees{'comments_on_block_command_lines'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[2]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'extra'}{'comment_at_end'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[1]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'extra'}{'prototypes'}[1]{'contents'}[0] = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[2]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'extra'}{'prototypes_line'}[0] = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'extra'}{'prototypes_line'}[2] = $result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'args'}[0]{'contents'}[2]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[32]{'parent'} = $result_trees{'comments_on_block_command_lines'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[33]{'parent'} = $result_trees{'comments_on_block_command_lines'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[1]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[1]{'extra'}{'comment_at_end'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[1]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'contents'}[1]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'extra'}{'node_content'}[0] = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[1]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'extra'}{'type'}{'content'}[0] = $result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'args'}[0]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[34]{'parent'} = $result_trees{'comments_on_block_command_lines'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[35]{'parent'} = $result_trees{'comments_on_block_command_lines'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'args'}[0]{'extra'}{'comment_at_end'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[36]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[36]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'contents'}[1]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[36]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[36]{'parent'} = $result_trees{'comments_on_block_command_lines'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[37]{'parent'} = $result_trees{'comments_on_block_command_lines'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'args'}[0]{'extra'}{'comment_at_end'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[38]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'contents'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[38]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'contents'}[1]{'args'}[0]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'contents'}[1]{'parent'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[38]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'extra'}{'end_command'} = $result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'contents'}[1]; +$result_trees{'comments_on_block_command_lines'}{'contents'}[38]{'parent'} = $result_trees{'comments_on_block_command_lines'}; +$result_trees{'comments_on_block_command_lines'}{'contents'}[39]{'parent'} = $result_trees{'comments_on_block_command_lines'}; $result_texis{'comments_on_block_command_lines'} = '@itemize @c comm @item itemize it @@ -2095,6 +2651,22 @@ in gr in ex @end example +@example in @code{first} arg, second arg @c comm +in ex with arg +@end example + +@example first, second, third @c comm +in ex 3 args +@end example + +@example first,second, third, fourth @c comm +in ex 4 args +@end example + +@display @c comm +in display +@end display + @multitable @columnfractions 0.4 0.6 @c comm @item a @tab b @end multitable @@ -2141,6 +2713,14 @@ in gr in ex +in ex with arg + +in ex 3 args + +in ex 4 args + +in display + a b aaa bbb @@ -2231,6 +2811,22 @@ $result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize comman <pre xml:space="preserve">in ex </pre></example> +<example spaces=" " endspaces=" "><examplelanguage>in <code>first</code> arg</examplelanguage><examplearg spaces=" ">second arg </examplearg><!-- c comm --> +<pre xml:space="preserve">in ex with arg +</pre></example> + +<example spaces=" " endspaces=" "><examplelanguage>first</examplelanguage><examplearg spaces=" ">second</examplearg><examplearg spaces=" ">third </examplearg><!-- c comm --> +<pre xml:space="preserve">in ex 3 args +</pre></example> + +<example spaces=" " endspaces=" "><examplelanguage>first</examplelanguage><examplearg>second</examplearg><examplearg spaces=" ">third</examplearg><examplearg spaces=" ">fourth </examplearg><!-- c comm --> +<pre xml:space="preserve">in ex 4 args +</pre></example> + +<display spaces=" " endspaces=" "><!-- c comm --> +<pre xml:space="preserve">in display +</pre></display> + <multitable spaces=" " endspaces=" "><columnfractions line="0.4 0.6 @c comm"><columnfraction value="0.4"></columnfraction><columnfraction value="0.6"></columnfraction></columnfractions><!-- c comm --> <tbody><row><entry command="item" spaces=" "><para>a </para></entry><entry command="tab" spaces=" "><para>b </para></entry></row></tbody></multitable> diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_on_misc_command_line.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_on_misc_command_line.pl index f50dd2419c..551a692b9e 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_on_misc_command_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/comments_on_misc_command_line.pl @@ -358,7 +358,20 @@ $result_texts{'comments_on_misc_command_line'} = ' Para. '; -$result_errors{'comments_on_misc_command_line'} = []; +$result_errors{'comments_on_misc_command_line'} = [ + { + 'error_line' => ':2: warning: @definfoenclose is obsolete. +', + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '', + 'text' => '@definfoenclose is obsolete.', + 'type' => 'warning' + } +]; + + +$result_floats{'comments_on_misc_command_line'} = {}; diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl index bf01e49502..5ed6f9fa9c 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl @@ -120,7 +120,9 @@ $result_trees{'image_inline_or_not'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -488,7 +490,11 @@ $result_trees{'image_inline_or_not'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => '' + }, 'parent' => {} }, { @@ -569,7 +575,11 @@ $result_trees{'image_inline_or_not'} = { 'extra' => { 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 25, + 'macro' => '' + }, 'parent' => {} } ], @@ -740,7 +750,11 @@ $result_trees{'image_inline_or_not'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => '' + }, 'parent' => {} }, { @@ -826,7 +840,11 @@ $result_trees{'image_inline_or_not'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 35, + 'macro' => '' + }, 'parent' => {} }, { @@ -852,7 +870,11 @@ $result_trees{'image_inline_or_not'} = { 'normalized' => 'node_005fimage' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 35, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -931,7 +953,11 @@ $result_trees{'image_inline_or_not'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 36, + 'macro' => '' + }, 'parent' => {} } ], @@ -974,7 +1000,11 @@ $result_trees{'image_inline_or_not'} = { 'normalized' => 'extnode' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 36, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -1131,14 +1161,20 @@ $result_trees{'image_inline_or_not'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'node_005fimage' } ], 'normalized' => 'node_005fimage', 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 41, + 'macro' => '' + }, 'parent' => {} }, { @@ -1390,7 +1426,11 @@ $result_trees{'image_inline_or_not'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 53, + 'macro' => '' + }, 'parent' => {} } ], @@ -1407,7 +1447,11 @@ $result_trees{'image_inline_or_not'} = { 'extra' => { 'float' => {} }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 53, + 'macro' => '' + }, 'parent' => {} }, { @@ -1456,7 +1500,9 @@ $result_trees{'image_inline_or_not'} = { 'normalized' => 'g', 'spaces_before_argument' => ' ', 'type' => { - 'content' => [], + 'content' => [ + {} + ], 'normalized' => 'F' } }, @@ -1473,7 +1519,11 @@ $result_trees{'image_inline_or_not'} = { 'spaces_before_argument' => ' ' }, 'level' => 1, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 42, + 'macro' => '' + }, 'number' => 1, 'parent' => {} } @@ -1496,7 +1546,7 @@ $result_trees{'image_inline_or_not'}{'contents'}[0]{'parent'} = $result_trees{'i $result_trees{'image_inline_or_not'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[1]{'args'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[1]; $result_trees{'image_inline_or_not'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'image_inline_or_not'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'image_inline_or_not'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'image_inline_or_not'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[1]{'parent'} = $result_trees{'image_inline_or_not'}; $result_trees{'image_inline_or_not'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'args'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]; @@ -1545,7 +1595,6 @@ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2 $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2]; -$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0]; @@ -1554,7 +1603,6 @@ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]; -$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[1]; @@ -1581,7 +1629,6 @@ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'extra'}{'command_as_argument'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'extra'}{'end_command'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[1]; -$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[11]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'extra'}{'command'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]; @@ -1594,14 +1641,12 @@ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]; -$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'contents'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'contents'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[3]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[1]{'contents'}[0]; -$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[0]{'args'}[0]; @@ -1614,7 +1659,6 @@ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]{'contents'}[3]{'args'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]{'contents'}[3]; -$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]{'contents'}[3]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[4]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]; @@ -1625,7 +1669,6 @@ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[ $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'extra'}{'menu_entry_name'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[1]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]{'contents'}[1]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[3]{'contents'}[3]; -$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[3]{'contents'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]; @@ -1646,8 +1689,7 @@ $result_trees{'image_inline_or_not'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'a $result_trees{'image_inline_or_not'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[3]{'args'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[3]; $result_trees{'image_inline_or_not'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'image_inline_or_not'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'image_inline_or_not'}{'contents'}[3]{'extra'}{'node_content'}; -$result_trees{'image_inline_or_not'}{'contents'}[3]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'}; +$result_trees{'image_inline_or_not'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[3]{'args'}[0]{'contents'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[3]{'parent'} = $result_trees{'image_inline_or_not'}; $result_trees{'image_inline_or_not'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'args'}[0]{'contents'}[0]; @@ -1681,12 +1723,10 @@ $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4 $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'}[1]; -$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'extra'}{'float'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]; -$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'args'}[0]; @@ -1696,9 +1736,8 @@ $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'cap $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'contents'}[6]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'float_section'} = $result_trees{'image_inline_or_not'}{'contents'}[4]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'node_content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'contents'}[0]; -$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'type'}{'content'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}; +$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'extra'}{'type'}{'content'}[0] = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]; $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'image_inline_or_not'}{'contents'}[4]; -$result_trees{'image_inline_or_not'}{'contents'}[4]{'line_nr'} = $result_trees{'image_inline_or_not'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'image_inline_or_not'}{'contents'}[4]{'parent'} = $result_trees{'image_inline_or_not'}; $result_texis{'image_inline_or_not'} = '@image{A} diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/lone_bye.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/lone_bye.pl index c9e83ceac3..4a8ac12019 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/lone_bye.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/lone_bye.pl @@ -34,6 +34,9 @@ $result_texts{'lone_bye'} = ''; $result_errors{'lone_bye'} = []; +$result_floats{'lone_bye'} = {}; + + $result_converted{'xml'}->{'lone_bye'} = '<bye></bye> '; diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/macro_and_args.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/macro_and_args.pl index 0752cd9d66..d56f2a36e0 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/macro_and_args.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/macro_and_args.pl @@ -142,6 +142,9 @@ $result_errors{'macro_and_args'} = [ ]; +$result_floats{'macro_and_args'} = {}; + + $result_converted{'xml'}->{'macro_and_args'} = '<macro name="good" line=" good { aaa, 2b-bb}"><formalarg>aaa</formalarg><formalarg>2b-bb</formalarg></macro> diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/node_and_bye.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/node_and_bye.pl index 68db4974b9..a557eea028 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/node_and_bye.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/node_and_bye.pl @@ -45,7 +45,9 @@ $result_trees{'node_and_bye'} = [ ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -83,7 +85,7 @@ $result_trees{'node_and_bye'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'paren $result_trees{'node_and_bye'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'node_and_bye'}[0]{'contents'}[1]; $result_trees{'node_and_bye'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'node_and_bye'}[0]{'contents'}[1]; $result_trees{'node_and_bye'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'node_and_bye'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'node_and_bye'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'node_and_bye'}[0]{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'node_and_bye'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'node_and_bye'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'node_and_bye'}[0]{'contents'}[1]{'parent'} = $result_trees{'node_and_bye'}[0]; $result_trees{'node_and_bye'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'node_and_bye'}[0]{'contents'}[2]; $result_trees{'node_and_bye'}[0]{'contents'}[2]{'parent'} = $result_trees{'node_and_bye'}[0]; @@ -118,6 +120,9 @@ $result_menus{'node_and_bye'} = { $result_errors{'node_and_bye'} = []; +$result_floats{'node_and_bye'} = {}; + + $result_elements{'node_and_bye'} = [ { 'extra' => { diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/node_no_section.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/node_no_section.pl index cb7ee95d62..6c134a2e6b 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/node_no_section.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/node_no_section.pl @@ -37,7 +37,9 @@ $result_trees{'node_no_section'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -58,7 +60,7 @@ $result_trees{'node_no_section'}{'contents'}[0]{'parent'} = $result_trees{'node_ $result_trees{'node_no_section'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'node_no_section'}{'contents'}[1]{'args'}[0]; $result_trees{'node_no_section'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'node_no_section'}{'contents'}[1]; $result_trees{'node_no_section'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'node_no_section'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'node_no_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'node_no_section'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'node_no_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'node_no_section'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'node_no_section'}{'contents'}[1]{'parent'} = $result_trees{'node_no_section'}; $result_texis{'node_no_section'} = '@node Top @@ -88,6 +90,9 @@ $result_menus{'node_no_section'} = { $result_errors{'node_no_section'} = []; +$result_floats{'node_no_section'} = {}; + + $result_converted{'xml'}->{'node_no_section'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node> '; diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/raw.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/raw.pl index f28aff1c58..3a181f35b4 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/raw.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/raw.pl @@ -195,6 +195,9 @@ Para $result_errors{'raw'} = []; +$result_floats{'raw'} = {}; + + $result_converted{'xml'}->{'raw'} = '<tex endspaces=" "> in <tex> diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/raw_and_comments.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/raw_and_comments.pl index 65cb1b5926..b2a35e5640 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/raw_and_comments.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/raw_and_comments.pl @@ -273,6 +273,9 @@ Para $result_errors{'raw_and_comments'} = []; +$result_floats{'raw_and_comments'} = {}; + + $result_converted{'xml'}->{'raw_and_comments'} = '<tex spaces=" " endspaces=" "><!-- c comment --> in <tex> diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/spaces_info_lost.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/spaces_info_lost.pl index f7ac19e9ff..bac2c48612 100644 --- a/macros/texinfo/texinfo/tp/t/results/xml_tests/spaces_info_lost.pl +++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/spaces_info_lost.pl @@ -13,7 +13,7 @@ $result_trees{'spaces_info_lost'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'text on example line' + 'text' => 'text on display line' } ], 'extra' => { @@ -24,13 +24,13 @@ $result_trees{'spaces_info_lost'} = { 'type' => 'block_line_arg' } ], - 'cmdname' => 'example', + 'cmdname' => 'display', 'contents' => [ { 'contents' => [ { 'parent' => {}, - 'text' => 'in bad example + 'text' => 'in bad display ' } ], @@ -43,7 +43,7 @@ $result_trees{'spaces_info_lost'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'example' + 'text' => 'display' } ], 'extra' => { @@ -56,9 +56,9 @@ $result_trees{'spaces_info_lost'} = { ], 'cmdname' => 'end', 'extra' => { - 'command_argument' => 'example', + 'command_argument' => 'display', 'spaces_before_argument' => ' ', - 'text_arg' => 'example' + 'text_arg' => 'display' }, 'line_nr' => { 'file_name' => '', @@ -137,9 +137,9 @@ $result_trees{'spaces_info_lost'}{'contents'}[2]{'contents'}[1]{'parent'} = $res $result_trees{'spaces_info_lost'}{'contents'}[2]{'parent'} = $result_trees{'spaces_info_lost'}; $result_trees{'spaces_info_lost'}{'contents'}[3]{'parent'} = $result_trees{'spaces_info_lost'}; -$result_texis{'spaces_info_lost'} = '@example text on example line -in bad example -@end example +$result_texis{'spaces_info_lost'} = '@display text on display line +in bad display +@end display @verbatim in verbatim @g @@ -147,7 +147,7 @@ in verbatim @g '; -$result_texts{'spaces_info_lost'} = 'in bad example +$result_texts{'spaces_info_lost'} = 'in bad display in verbatim @g '; @@ -155,10 +155,13 @@ in verbatim @g $result_errors{'spaces_info_lost'} = []; +$result_floats{'spaces_info_lost'} = {}; -$result_converted{'xml'}->{'spaces_info_lost'} = '<example spaces=" " endspaces=" "> -<pre xml:space="preserve">in bad example -</pre></example> + + +$result_converted{'xml'}->{'spaces_info_lost'} = '<display spaces=" " endspaces=" "> +<pre xml:space="preserve">in bad display +</pre></display> <verbatim xml:space="preserve"> in verbatim @g |