diff options
author | Norbert Preining <norbert@preining.info> | 2021-07-04 03:01:24 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-07-04 03:01:24 +0000 |
commit | 7994f86ec5e18f9d0d9f90161a2f26dd26d26af7 (patch) | |
tree | 88edb7d1a1aed3183a1350202c898716b4ac59ce /macros/texinfo/texinfo/tp/t/results/plaintext_tests | |
parent | 03fa062b03ce2bb5385f8f30888f94d441fa5cb4 (diff) |
CTAN sync 202107040301
Diffstat (limited to 'macros/texinfo/texinfo/tp/t/results/plaintext_tests')
69 files changed, 1209 insertions, 575 deletions
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl index cbcf396fa9..49a49eace1 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/U_with_utf8_enable_encoding.pl @@ -94,6 +94,9 @@ $result_texts{'U_with_utf8_enable_encoding'} = '00FF (should be a real y-dieresi $result_errors{'U_with_utf8_enable_encoding'} = []; +$result_floats{'U_with_utf8_enable_encoding'} = {}; + + $result_converted{'plaintext'}->{'U_with_utf8_enable_encoding'} = 'ÿ (should be a real y-dieresis in UTF-8). '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accent_command_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accent_command_punctuation.pl index 7d94f47b73..c2c7275eb1 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accent_command_punctuation.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accent_command_punctuation.pl @@ -56,6 +56,9 @@ $result_texts{'accent_command_punctuation'} = 'e. after'; $result_errors{'accent_command_punctuation'} = []; +$result_floats{'accent_command_punctuation'} = {}; + + $result_converted{'plaintext'}->{'accent_command_punctuation'} = 'ė after '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl index b37872b61b..8e9c2a66e4 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl @@ -95,7 +95,11 @@ $result_trees{'accents_in_var_enable_encoding'} = { ], 'cmdname' => 'u', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -117,7 +121,11 @@ $result_trees{'accents_in_var_enable_encoding'} = { ], 'cmdname' => '`', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -127,7 +135,11 @@ $result_trees{'accents_in_var_enable_encoding'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -153,15 +165,12 @@ $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'a $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]; -$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]; -$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]; -$result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'line_nr'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]; $result_trees{'accents_in_var_enable_encoding'}{'contents'}[2]{'parent'} = $result_trees{'accents_in_var_enable_encoding'}; @@ -179,6 +188,9 @@ AAc, r( e`. $result_errors{'accents_in_var_enable_encoding'} = []; +$result_floats{'accents_in_var_enable_encoding'} = {}; + + $result_converted{'plaintext'}->{'accents_in_var_enable_encoding'} = 'AAÇ R̆ È. '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl index 21f86736d5..5cff3c4788 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/after_punctuation_character_in_command.pl @@ -72,6 +72,9 @@ follows. $result_errors{'after_punctuation_character_in_command'} = []; +$result_floats{'after_punctuation_character_in_command'} = {}; + + $result_converted{'plaintext'}->{'after_punctuation_character_in_command'} = 'Text.) follows. '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/all_spaces.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/all_spaces.pl index 291d58c429..5f195fa5ad 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/all_spaces.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/all_spaces.pl @@ -544,7 +544,9 @@ $result_trees{'all_spaces'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -652,7 +654,7 @@ $result_trees{'all_spaces'}{'contents'}[1]{'contents'}[53]{'contents'}[0]{'paren $result_trees{'all_spaces'}{'contents'}[1]{'contents'}[53]{'parent'} = $result_trees{'all_spaces'}{'contents'}[1]; $result_trees{'all_spaces'}{'contents'}[1]{'contents'}[54]{'parent'} = $result_trees{'all_spaces'}{'contents'}[1]; $result_trees{'all_spaces'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'all_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'all_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'all_spaces'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'all_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'all_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'all_spaces'}{'contents'}[1]{'parent'} = $result_trees{'all_spaces'}; $result_texis{'all_spaces'} = '@documentencoding utf-8 @@ -793,4 +795,7 @@ $result_menus{'all_spaces'} = { $result_errors{'all_spaces'} = []; +$result_floats{'all_spaces'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl index 81dae992ee..9256c1e916 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl @@ -107,6 +107,9 @@ text 2. $result_errors{'anchor_and_empty_lines'} = []; +$result_floats{'anchor_and_empty_lines'} = {}; + + $result_converted{'plaintext'}->{'anchor_and_empty_lines'} = 'text 1. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl index 439c13f4ba..1876f8be62 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl @@ -323,7 +323,11 @@ $result_trees{'at_commands_glued_in_example'} = { ], 'cmdname' => '^', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 10, + 'macro' => '' + }, 'parent' => {} }, { @@ -584,7 +588,6 @@ $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'con $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]; $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[25]{'args'}[0]; $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[25]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[25]; -$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[25]{'line_nr'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[25]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]; $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[26]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]; $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[27]{'parent'} = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[1]; @@ -688,6 +691,9 @@ $result_errors{'at_commands_glued_in_example'} = [ ]; +$result_floats{'at_commands_glued_in_example'} = {}; + + $result_converted{'plaintext'}->{'at_commands_glued_in_example'} = ' at@. TeXTeXTeX. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl index 36330952e8..5d4921e447 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl @@ -311,7 +311,11 @@ $result_trees{'at_commands_glued_in_paragraph'} = { ], 'cmdname' => '^', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => '' + }, 'parent' => {} }, { @@ -535,7 +539,6 @@ $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[25]{' $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[25]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[25]{'args'}[0]{'contents'}[0]; $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[25]{'args'}[0]; $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[25]{'args'}[0]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[25]; -$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[25]{'line_nr'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[25]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]; $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]; $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[27]{'parent'} = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]; @@ -633,6 +636,9 @@ $result_errors{'at_commands_glued_in_paragraph'} = [ ]; +$result_floats{'at_commands_glued_in_paragraph'} = {}; + + $result_converted{'plaintext'}->{'at_commands_glued_in_paragraph'} = 'at@. TeXTeXTeX. code\'in code\'code. acronymABC (aaa bb cc)acronym. acronym2ABCacronym. emailmali <somebody>email. ref*note Top::ref. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/before_accent_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/before_accent_punctuation.pl index c703497f24..3e7a541adc 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/before_accent_punctuation.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/before_accent_punctuation.pl @@ -56,6 +56,9 @@ $result_texts{'before_accent_punctuation'} = 'a. a^'; $result_errors{'before_accent_punctuation'} = []; +$result_floats{'before_accent_punctuation'} = {}; + + $result_converted{'plaintext'}->{'before_accent_punctuation'} = 'a. â '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl index a9d9bf0682..e399476c45 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl @@ -50,7 +50,11 @@ $result_trees{'characters_and_commands_in_var'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -72,7 +76,11 @@ $result_trees{'characters_and_commands_in_var'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -94,7 +102,11 @@ $result_trees{'characters_and_commands_in_var'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -224,7 +236,11 @@ $result_trees{'characters_and_commands_in_var'} = { ], 'cmdname' => 'u', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} }, { @@ -246,7 +262,11 @@ $result_trees{'characters_and_commands_in_var'} = { ], 'cmdname' => '`', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} }, { @@ -263,7 +283,11 @@ $result_trees{'characters_and_commands_in_var'} = { ], 'cmdname' => 'aa', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} } ], @@ -273,7 +297,11 @@ $result_trees{'characters_and_commands_in_var'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} }, { @@ -384,17 +412,14 @@ $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[0]{'p $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[2]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[2]; -$result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[4]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[4]; -$result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[6]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[6]; -$result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}; @@ -415,19 +440,15 @@ $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'a $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]; -$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]; -$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]; -$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]; -$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'line_nr'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'characters_and_commands_in_var'}{'contents'}[4]; $result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'parent'} = $result_trees{'characters_and_commands_in_var'}; @@ -473,6 +494,9 @@ AAA $result_errors{'characters_and_commands_in_var'} = []; +$result_floats{'characters_and_commands_in_var'} = {}; + + $result_converted{'plaintext'}->{'characters_and_commands_in_var'} = 'AAA. DLKSFJF ) . (FDFDSFSD. SQDQ,QDSDSQ. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl index a0c920ebbf..361d7807c9 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl @@ -344,7 +344,9 @@ $result_trees{'chinese_mixed_with_en'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -425,7 +427,7 @@ $result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'contents'}[15]{'parent'} $result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'chinese_mixed_with_en'}{'contents'}[1]; $result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'chinese_mixed_with_en'}{'contents'}[1]; $result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'parent'} = $result_trees{'chinese_mixed_with_en'}; $result_trees{'chinese_mixed_with_en'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'chinese_mixed_with_en'}{'contents'}[2]; $result_trees{'chinese_mixed_with_en'}{'contents'}[2]{'parent'} = $result_trees{'chinese_mixed_with_en'}; @@ -518,4 +520,7 @@ $result_menus{'chinese_mixed_with_en'} = { $result_errors{'chinese_mixed_with_en'} = []; +$result_floats{'chinese_mixed_with_en'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl index d2eb9d7ca9..72eb437a72 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/code_commands_and_punctuation.pl @@ -50,7 +50,11 @@ $result_trees{'code_commands_and_punctuation'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -71,7 +75,6 @@ $result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'contents'}[0]{'pa $result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'code_commands_and_punctuation'}{'contents'}[0]; $result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'contents'}[2]{'args'}[0]; $result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'contents'}[2]; -$result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'code_commands_and_punctuation'}{'contents'}[0]; $result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'code_commands_and_punctuation'}{'contents'}[0]; $result_trees{'code_commands_and_punctuation'}{'contents'}[0]{'parent'} = $result_trees{'code_commands_and_punctuation'}; @@ -86,6 +89,9 @@ $result_texts{'code_commands_and_punctuation'} = 'AA. aa. After. $result_errors{'code_commands_and_punctuation'} = []; +$result_floats{'code_commands_and_punctuation'} = {}; + + $result_converted{'plaintext'}->{'code_commands_and_punctuation'} = '\'AA\'. \'aa\'. After. '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl index 2dd420bdfd..8f2a9844d2 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/command_brace_no_arg_punctuation.pl @@ -40,7 +40,11 @@ $result_trees{'command_brace_no_arg_punctuation'} = { ], 'cmdname' => 'LaTeX', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -57,7 +61,11 @@ $result_trees{'command_brace_no_arg_punctuation'} = { ], 'cmdname' => 'copyright', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -74,7 +82,11 @@ $result_trees{'command_brace_no_arg_punctuation'} = { ], 'cmdname' => 'registeredsymbol', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -93,15 +105,12 @@ $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[0]{ $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[2]; -$result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[4]; -$result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[6]; -$result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]; $result_trees{'command_brace_no_arg_punctuation'}{'contents'}[0]{'parent'} = $result_trees{'command_brace_no_arg_punctuation'}; @@ -116,6 +125,9 @@ $result_texts{'command_brace_no_arg_punctuation'} = 'TeX. And LaTeX. (C). (R). E $result_errors{'command_brace_no_arg_punctuation'} = []; +$result_floats{'command_brace_no_arg_punctuation'} = {}; + + $result_converted{'plaintext'}->{'command_brace_no_arg_punctuation'} = 'TeX. And LaTeX. (C). (R). End. '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/commands_and_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/commands_and_punctuation.pl index 7e119f08ba..c4d9bf1280 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/commands_and_punctuation.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/commands_and_punctuation.pl @@ -60,7 +60,11 @@ $result_trees{'commands_and_punctuation'} = { ], 'cmdname' => 'enddots', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -83,7 +87,6 @@ $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[5]{'args'}[ $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'commands_and_punctuation'}{'contents'}[0]; $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'commands_and_punctuation'}{'contents'}[0]; $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[7]; -$result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[5]{'line_nr'}; $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'commands_and_punctuation'}{'contents'}[0]; $result_trees{'commands_and_punctuation'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'commands_and_punctuation'}{'contents'}[0]; $result_trees{'commands_and_punctuation'}{'contents'}[0]{'parent'} = $result_trees{'commands_and_punctuation'}; @@ -96,6 +99,9 @@ $result_texts{'commands_and_punctuation'} = 'SomthingA. and now inhibit. Now d $result_errors{'commands_and_punctuation'} = []; +$result_floats{'commands_and_punctuation'} = {}; + + $result_converted{'plaintext'}->{'commands_and_punctuation'} = 'SomthingA. and now inhibit. Now dots ... and enddots ... and '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/east_asian_in_w.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/east_asian_in_w.pl index b90900de05..2d1cd038d4 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/east_asian_in_w.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/east_asian_in_w.pl @@ -182,4 +182,7 @@ This option overrides an include file name section and aaaaa aaaa $result_errors{'east_asian_in_w'} = []; +$result_floats{'east_asian_in_w'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/empty_line_in_example_end.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/empty_line_in_example_end.pl index 4bb783585a..45cb4edd45 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/empty_line_in_example_end.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/empty_line_in_example_end.pl @@ -129,6 +129,9 @@ After line $result_errors{'empty_line_in_example_end'} = []; +$result_floats{'empty_line_in_example_end'} = {}; + + $result_converted{'plaintext'}->{'empty_line_in_example_end'} = ' in example diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl index 26ca133db5..1492bbb2cf 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl @@ -212,6 +212,9 @@ $result_errors{'empty_multitable_in_itemize'} = [ ]; +$result_floats{'empty_multitable_in_itemize'} = {}; + + $result_converted{'plaintext'}->{'empty_multitable_in_itemize'} = ' a-n itemize line in macro diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/end_sentence_space_protected.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/end_sentence_space_protected.pl index 76ad2010de..db1ec8afc5 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/end_sentence_space_protected.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/end_sentence_space_protected.pl @@ -46,8 +46,11 @@ $result_texts{'end_sentence_space_protected'} = 'Some text. Next sentence. $result_errors{'end_sentence_space_protected'} = []; +$result_floats{'end_sentence_space_protected'} = {}; -$result_converted{'plaintext'}->{'end_sentence_space_protected'} = 'Some text. Next sentence. + + +$result_converted{'plaintext'}->{'end_sentence_space_protected'} = 'Some text. Next sentence. '; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/expanded_tex.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/expanded_tex.pl index 827df12053..39ce74d8ed 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/expanded_tex.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/expanded_tex.pl @@ -132,6 +132,9 @@ bbbbbbbbb1 bbbbbbbbbbb2 bbbbbbbbbb3 bbbbbbbbbbbbbb4. $result_errors{'expanded_tex'} = []; +$result_floats{'expanded_tex'} = {}; + + $result_converted{'plaintext'}->{'expanded_tex'} = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa TTT diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl index 9c0e9dd47f..02b4df828f 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/flushright_not_closed_and_format.pl @@ -154,6 +154,9 @@ $result_errors{'flushright_not_closed_and_format'} = [ ]; +$result_floats{'flushright_not_closed_and_format'} = {}; + + $result_converted{'plaintext'}->{'flushright_not_closed_and_format'} = ' flushright diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/html_expanded.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/html_expanded.pl index 94f9ebd5d4..6f748a473e 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/html_expanded.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/html_expanded.pl @@ -118,6 +118,9 @@ after. $result_errors{'html_expanded'} = []; +$result_floats{'html_expanded'} = {}; + + $result_converted{'plaintext'}->{'html_expanded'} = 'Before html diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/inhibit_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/inhibit_punctuation.pl index 2b6133f986..66e782631d 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/inhibit_punctuation.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/inhibit_punctuation.pl @@ -159,6 +159,9 @@ but , , $result_errors{'inhibit_punctuation'} = []; +$result_floats{'inhibit_punctuation'} = {}; + + $result_converted{'plaintext'}->{'inhibit_punctuation'} = 'foo vs. bar. colon :And something else. semi colon ;. And ? ?. ? Now ! !@ ! but , , diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl index 944b6bd583..e6cd825a0a 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl @@ -139,6 +139,9 @@ Insertcopying $result_errors{'insert_copying_and_paragraph'} = []; +$result_floats{'insert_copying_and_paragraph'} = {}; + + $result_converted{'plaintext'}->{'insert_copying_and_paragraph'} = 'Insertcopying In copying. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/insert_copying_inline_and_paragraph.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/insert_copying_inline_and_paragraph.pl deleted file mode 100644 index f126fbc53b..0000000000 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/insert_copying_inline_and_paragraph.pl +++ /dev/null @@ -1,166 +0,0 @@ -use vars qw(%result_texis %result_texts %result_trees %result_errors - %result_indices %result_sectioning %result_nodes %result_menus - %result_floats %result_converted %result_converted_errors - %result_elements %result_directions_text); - -use utf8; - -$result_trees{'insert_copying_inline_and_paragraph'} = { - 'contents' => [ - { - 'cmdname' => 'copying', - 'contents' => [ - { - 'extra' => { - 'command' => {} - }, - 'parent' => {}, - 'text' => ' -', - 'type' => 'empty_line_after_command' - }, - { - 'contents' => [ - { - 'parent' => {}, - 'text' => 'In copying. -' - } - ], - 'parent' => {}, - 'type' => 'paragraph' - }, - { - 'args' => [ - { - 'contents' => [ - { - 'extra' => { - 'command' => {} - }, - 'parent' => {}, - 'text' => ' ', - 'type' => 'empty_spaces_after_command' - }, - { - 'parent' => {}, - 'text' => 'copying' - }, - { - 'parent' => {}, - 'text' => ' -', - 'type' => 'spaces_at_end' - } - ], - 'parent' => {}, - 'type' => 'misc_line_arg' - } - ], - 'cmdname' => 'end', - 'extra' => { - 'command' => {}, - 'command_argument' => 'copying', - 'spaces_after_command' => {}, - 'text_arg' => 'copying' - }, - 'line_nr' => { - 'file_name' => '', - 'line_nr' => 3, - 'macro' => '' - }, - 'parent' => {} - } - ], - 'extra' => { - 'end_command' => {}, - 'spaces_after_command' => {} - }, - 'line_nr' => { - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '' - }, - 'parent' => {} - }, - { - 'parent' => {}, - 'text' => ' -', - 'type' => 'empty_line' - }, - { - 'contents' => [ - { - 'parent' => {}, - 'text' => 'Insertcopying -' - } - ], - 'parent' => {}, - 'type' => 'paragraph' - }, - { - 'cmdname' => 'insertcopying', - 'line_nr' => { - 'file_name' => '', - 'line_nr' => 6, - 'macro' => '' - }, - 'parent' => {} - }, - { - 'parent' => {}, - 'text' => ' -' - } - ], - 'type' => 'text_root' -}; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[1]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'args'}[0]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'args'}[0]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'args'}[0]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[2]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'contents'}[0]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[0]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[1]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[2]; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[2]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[3]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}; -$result_trees{'insert_copying_inline_and_paragraph'}{'contents'}[4]{'parent'} = $result_trees{'insert_copying_inline_and_paragraph'}; - -$result_texis{'insert_copying_inline_and_paragraph'} = '@copying -In copying. -@end copying - -Insertcopying -@insertcopying -'; - - -$result_texts{'insert_copying_inline_and_paragraph'} = ' -Insertcopying - -'; - -$result_errors{'insert_copying_inline_and_paragraph'} = []; - - -$result_floats{'insert_copying_inline_and_paragraph'} = {}; - - - -$result_converted{'plaintext'}->{'insert_copying_inline_and_paragraph'} = 'Insertcopying - In copying. -'; - -1; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl index 04c0446388..59da57fe73 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl @@ -57,6 +57,9 @@ $result_errors{'invalid_accent_punctuation'} = [ ]; +$result_floats{'invalid_accent_punctuation'} = {}; + + $result_converted{'plaintext'}->{'invalid_accent_punctuation'} = 'a. ̂@ '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/isolated_html_expanded.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/isolated_html_expanded.pl index abeb3d5e79..d5291959b1 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/isolated_html_expanded.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/isolated_html_expanded.pl @@ -104,6 +104,9 @@ $result_texts{'isolated_html_expanded'} = ' $result_errors{'isolated_html_expanded'} = []; +$result_floats{'isolated_html_expanded'} = {}; + + $result_converted{'plaintext'}->{'isolated_html_expanded'} = 'html '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl index 5da3dc987d..f25ab002e5 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl @@ -705,6 +705,9 @@ $result_errors{'itemize_in_headitem_in_example'} = [ ]; +$result_floats{'itemize_in_headitem_in_example'} = {}; + + $result_converted{'plaintext'}->{'itemize_in_headitem_in_example'} = ' a diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl index d2bc505ec9..1034027238 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl @@ -185,7 +185,9 @@ $result_trees{'japanese_utf8'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -641,7 +643,9 @@ $result_trees{'japanese_utf8'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Preface' } ], @@ -741,7 +745,9 @@ $result_trees{'japanese_utf8'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Introduction' } ], @@ -846,7 +852,7 @@ $result_trees{'japanese_utf8'}{'contents'}[0]{'parent'} = $result_trees{'japanes $result_trees{'japanese_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[1]{'args'}[0]; $result_trees{'japanese_utf8'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[1]; $result_trees{'japanese_utf8'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'japanese_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'japanese_utf8'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'japanese_utf8'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'japanese_utf8'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'japanese_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'japanese_utf8'}{'contents'}[1]{'parent'} = $result_trees{'japanese_utf8'}; $result_trees{'japanese_utf8'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[2]{'args'}[0]; $result_trees{'japanese_utf8'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[2]; @@ -915,7 +921,7 @@ $result_trees{'japanese_utf8'}{'contents'}[2]{'parent'} = $result_trees{'japanes $result_trees{'japanese_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[3]{'args'}[0]; $result_trees{'japanese_utf8'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[3]; $result_trees{'japanese_utf8'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'japanese_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'japanese_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'japanese_utf8'}{'contents'}[3]{'extra'}{'node_content'}; +$result_trees{'japanese_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'japanese_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0]; $result_trees{'japanese_utf8'}{'contents'}[3]{'parent'} = $result_trees{'japanese_utf8'}; $result_trees{'japanese_utf8'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[4]{'args'}[0]; $result_trees{'japanese_utf8'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[4]; @@ -928,7 +934,7 @@ $result_trees{'japanese_utf8'}{'contents'}[4]{'parent'} = $result_trees{'japanes $result_trees{'japanese_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[5]{'args'}[0]; $result_trees{'japanese_utf8'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[5]; $result_trees{'japanese_utf8'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'japanese_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'japanese_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'japanese_utf8'}{'contents'}[5]{'extra'}{'node_content'}; +$result_trees{'japanese_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'japanese_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0]; $result_trees{'japanese_utf8'}{'contents'}[5]{'parent'} = $result_trees{'japanese_utf8'}; $result_trees{'japanese_utf8'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[6]{'args'}[0]; $result_trees{'japanese_utf8'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'japanese_utf8'}{'contents'}[6]; @@ -1184,4 +1190,7 @@ $result_menus{'japanese_utf8'}{'menu_child'}{'menu_up'} = $result_menus{'japanes $result_errors{'japanese_utf8'} = []; +$result_floats{'japanese_utf8'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl index 6a3d8a6fa9..1e166ae98a 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl @@ -2350,7 +2350,9 @@ $result_trees{'line_passed_and_formats'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -2711,7 +2713,7 @@ $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'parent' $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[51]{'contents'}[0]{'parent'} = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[51]; $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[51]{'parent'} = $result_trees{'line_passed_and_formats'}{'contents'}[1]; $result_trees{'line_passed_and_formats'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'line_passed_and_formats'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'line_passed_and_formats'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'line_passed_and_formats'}{'contents'}[1]{'parent'} = $result_trees{'line_passed_and_formats'}; $result_texis{'line_passed_and_formats'} = '@node Top @@ -2993,6 +2995,9 @@ $result_menus{'line_passed_and_formats'} = { $result_errors{'line_passed_and_formats'} = []; +$result_floats{'line_passed_and_formats'} = {}; + + $result_converted{'plaintext'}->{'line_passed_and_formats'} = ' special: Quotation special. Nested quotation sdflkmsfdlkmfsdqmlkfsdq mlfdsqlkmfdsqmlkfdsq diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl index 18ac041ac9..0c91f73f77 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/lone_braces_in_inlineraw.pl @@ -52,7 +52,11 @@ $result_trees{'lone_braces_in_inlineraw'} = { 'expand_index' => 1, 'format' => 'plaintext' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -72,7 +76,6 @@ $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[ $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]; $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1]; $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]; -$result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]; $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]; $result_trees{'lone_braces_in_inlineraw'}{'contents'}[0]{'parent'} = $result_trees{'lone_braces_in_inlineraw'}; @@ -87,6 +90,9 @@ $result_texts{'lone_braces_in_inlineraw'} = '. $result_errors{'lone_braces_in_inlineraw'} = []; +$result_floats{'lone_braces_in_inlineraw'} = {}; + + $result_converted{'plaintext'}->{'lone_braces_in_inlineraw'} = '{truc}. '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/long_line.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/long_line.pl index c47a8e2dd7..d8eaeab90a 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/long_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/long_line.pl @@ -194,6 +194,9 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaaa BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB $result_errors{'long_line'} = []; +$result_floats{'long_line'} = {}; + + $result_converted{'plaintext'}->{'long_line'} = 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/long_uref_after_item.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/long_uref_after_item.pl index f5ae8c0c73..e8de415a4e 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/long_uref_after_item.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/long_uref_after_item.pl @@ -159,6 +159,9 @@ $result_texts{'long_uref_after_item'} = 'http://foo.org/some/long/url/which/goes $result_errors{'long_uref_after_item'} = []; +$result_floats{'long_uref_after_item'} = {}; + + $result_converted{'plaintext'}->{'long_uref_after_item'} = ' * <http://foo.org/some/long/url/which/goes/past/eighty/columns/and/has/no/alternative/text.html> diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl index 3163ecb2a6..45dd8d0020 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl @@ -49,7 +49,11 @@ $result_trees{'multiline_image_and_align'} = { 'extra' => { 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -104,7 +108,11 @@ $result_trees{'multiline_image_and_align'} = { 'extra' => { 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -159,7 +167,11 @@ $result_trees{'multiline_image_and_align'} = { 'extra' => { 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} }, { @@ -218,7 +230,11 @@ $result_trees{'multiline_image_and_align'} = { 'extra' => { 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} }, { @@ -339,7 +355,11 @@ $result_trees{'multiline_image_and_align'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 13, + 'macro' => '' + }, 'parent' => {} }, { @@ -446,7 +466,6 @@ $result_trees{'multiline_image_and_align'}{'contents'}[0]{'args'}[0]{'contents'} $result_trees{'multiline_image_and_align'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[0]{'args'}[0]{'contents'}[0]; $result_trees{'multiline_image_and_align'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[0]{'args'}[0]; $result_trees{'multiline_image_and_align'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[0]; -$result_trees{'multiline_image_and_align'}{'contents'}[0]{'line_nr'} = $result_trees{'multiline_image_and_align'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'multiline_image_and_align'}{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}; $result_trees{'multiline_image_and_align'}{'contents'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}; $result_trees{'multiline_image_and_align'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[2]{'args'}[0]; @@ -454,7 +473,6 @@ $result_trees{'multiline_image_and_align'}{'contents'}[2]{'args'}[0]{'contents'} $result_trees{'multiline_image_and_align'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[2]{'args'}[0]{'contents'}[1]; $result_trees{'multiline_image_and_align'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[2]{'args'}[0]; $result_trees{'multiline_image_and_align'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[2]; -$result_trees{'multiline_image_and_align'}{'contents'}[2]{'line_nr'} = $result_trees{'multiline_image_and_align'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'multiline_image_and_align'}{'contents'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}; $result_trees{'multiline_image_and_align'}{'contents'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}; $result_trees{'multiline_image_and_align'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[4]{'args'}[0]; @@ -462,7 +480,6 @@ $result_trees{'multiline_image_and_align'}{'contents'}[4]{'args'}[0]{'contents'} $result_trees{'multiline_image_and_align'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[4]{'args'}[0]{'contents'}[1]; $result_trees{'multiline_image_and_align'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[4]{'args'}[0]; $result_trees{'multiline_image_and_align'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[4]; -$result_trees{'multiline_image_and_align'}{'contents'}[4]{'line_nr'} = $result_trees{'multiline_image_and_align'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'multiline_image_and_align'}{'contents'}[4]{'parent'} = $result_trees{'multiline_image_and_align'}; $result_trees{'multiline_image_and_align'}{'contents'}[5]{'parent'} = $result_trees{'multiline_image_and_align'}; $result_trees{'multiline_image_and_align'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[6]{'args'}[0]; @@ -471,7 +488,6 @@ $result_trees{'multiline_image_and_align'}{'contents'}[6]{'args'}[0]{'contents'} $result_trees{'multiline_image_and_align'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[6]{'args'}[0]; $result_trees{'multiline_image_and_align'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[6]{'args'}[0]; $result_trees{'multiline_image_and_align'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[6]; -$result_trees{'multiline_image_and_align'}{'contents'}[6]{'line_nr'} = $result_trees{'multiline_image_and_align'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'multiline_image_and_align'}{'contents'}[6]{'parent'} = $result_trees{'multiline_image_and_align'}; $result_trees{'multiline_image_and_align'}{'contents'}[7]{'parent'} = $result_trees{'multiline_image_and_align'}; $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[0]{'extra'}{'command'} = $result_trees{'multiline_image_and_align'}{'contents'}[8]; @@ -490,7 +506,6 @@ $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'conten $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]; $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'contents'}[3]{'args'}[0]; $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'contents'}[3]; -$result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'contents'}[1]{'line_nr'}; $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]; $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]; $result_trees{'multiline_image_and_align'}{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'multiline_image_and_align'}{'contents'}[8]; @@ -547,6 +562,9 @@ figure JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ $result_errors{'multiline_image_and_align'} = []; +$result_floats{'multiline_image_and_align'} = {}; + + $result_converted{'plaintext'}->{'multiline_image_and_align'} = ' 1 A B 2 C D diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_verb_after_space.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_verb_after_space.pl index 7ba8d8e622..06166e12a4 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_verb_after_space.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_verb_after_space.pl @@ -77,6 +77,9 @@ bb. $result_errors{'multiline_verb_after_space'} = []; +$result_floats{'multiline_verb_after_space'} = {}; + + $result_converted{'plaintext'}->{'multiline_verb_after_space'} = 'AA aa bb. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multitable.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multitable.pl index 61846396a6..adcafea4bc 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multitable.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multitable.pl @@ -94,7 +94,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} } ], @@ -150,7 +154,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -200,11 +208,15 @@ $result_trees{'multitable'} = { 'max_columns' => 2, 'prototypes' => [ { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' }, { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' } ], @@ -310,7 +322,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} } ], @@ -366,7 +382,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} } ], @@ -422,7 +442,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => '' + }, 'parent' => {} } ], @@ -478,7 +502,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 10, + 'macro' => '' + }, 'parent' => {} } ], @@ -534,7 +562,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 11, + 'macro' => '' + }, 'parent' => {} } ], @@ -590,7 +622,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 12, + 'macro' => '' + }, 'parent' => {} } ], @@ -646,7 +682,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 13, + 'macro' => '' + }, 'parent' => {} } ], @@ -702,7 +742,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => '' + }, 'parent' => {} } ], @@ -758,7 +802,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 15, + 'macro' => '' + }, 'parent' => {} } ], @@ -814,7 +862,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 16, + 'macro' => '' + }, 'parent' => {} } ], @@ -870,7 +922,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 17, + 'macro' => '' + }, 'parent' => {} } ], @@ -926,7 +982,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 18, + 'macro' => '' + }, 'parent' => {} } ], @@ -982,7 +1042,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 19, + 'macro' => '' + }, 'parent' => {} } ], @@ -1044,7 +1108,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => '' + }, 'parent' => {} } ], @@ -1094,11 +1162,15 @@ $result_trees{'multitable'} = { 'max_columns' => 2, 'prototypes' => [ { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' }, { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' } ], @@ -1204,7 +1276,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => '' + }, 'parent' => {} } ], @@ -1260,7 +1336,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 25, + 'macro' => '' + }, 'parent' => {} } ], @@ -1316,7 +1396,11 @@ $result_trees{'multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 26, + 'macro' => '' + }, 'parent' => {} } ], @@ -1366,11 +1450,15 @@ $result_trees{'multitable'} = { 'max_columns' => 2, 'prototypes' => [ { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' }, { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' } ], @@ -1531,7 +1619,9 @@ $result_trees{'multitable'} = { 'max_columns' => 1, 'prototypes' => [ { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' } ], @@ -1763,11 +1853,15 @@ $result_trees{'multitable'} = { 'max_columns' => 2, 'prototypes' => [ { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' }, { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' } ], @@ -1794,7 +1888,6 @@ $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'conten $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]; @@ -1802,7 +1895,6 @@ $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'conten $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]; @@ -1810,8 +1902,8 @@ $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'} $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[0]; $result_trees{'multitable'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}; -$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}; +$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[0]{'parent'} = $result_trees{'multitable'}; $result_trees{'multitable'}{'contents'}[1]{'parent'} = $result_trees{'multitable'}; $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[0]; @@ -1825,7 +1917,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]; @@ -1833,7 +1924,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]; @@ -1841,7 +1931,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]; @@ -1849,7 +1938,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]; @@ -1857,7 +1945,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]; @@ -1865,7 +1952,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]; @@ -1873,7 +1959,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]; @@ -1881,7 +1966,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]; @@ -1889,7 +1973,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]; @@ -1897,7 +1980,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]; @@ -1905,7 +1987,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'conte $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[0]; @@ -1913,7 +1994,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'conte $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[0]; @@ -1921,7 +2001,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'conte $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]; @@ -1930,7 +2009,6 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'conten $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[2]; @@ -1938,8 +2016,8 @@ $result_trees{'multitable'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'} $result_trees{'multitable'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[2]; $result_trees{'multitable'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'multitable'}{'contents'}[2]; $result_trees{'multitable'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[2]{'contents'}[2]; -$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}; -$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}; +$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[2]{'parent'} = $result_trees{'multitable'}; $result_trees{'multitable'}{'contents'}[3]{'parent'} = $result_trees{'multitable'}; $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0]; @@ -1953,7 +2031,6 @@ $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'conten $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]; @@ -1961,7 +2038,6 @@ $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'conten $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]; @@ -1969,7 +2045,6 @@ $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'conten $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'line_nr'}; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]; @@ -1977,8 +2052,8 @@ $result_trees{'multitable'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'} $result_trees{'multitable'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[4]; $result_trees{'multitable'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[4]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}; -$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}; +$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[1]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[4]{'parent'} = $result_trees{'multitable'}; $result_trees{'multitable'}{'contents'}[5]{'parent'} = $result_trees{'multitable'}; $result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[0]; @@ -1998,7 +2073,7 @@ $result_trees{'multitable'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'} $result_trees{'multitable'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[6]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[6]; $result_trees{'multitable'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[6]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}; +$result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[6]{'parent'} = $result_trees{'multitable'}; $result_trees{'multitable'}{'contents'}[7]{'parent'} = $result_trees{'multitable'}; $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[0]; @@ -2028,8 +2103,8 @@ $result_trees{'multitable'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'} $result_trees{'multitable'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'multitable'}{'contents'}[8]{'contents'}[1]; $result_trees{'multitable'}{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'multitable'}{'contents'}[8]; $result_trees{'multitable'}{'contents'}[8]{'extra'}{'end_command'} = $result_trees{'multitable'}{'contents'}[8]{'contents'}[1]; -$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}; -$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[2]{'contents'}; +$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[1]{'contents'}[0] = $result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[2]{'contents'}[0]; $result_trees{'multitable'}{'contents'}[8]{'parent'} = $result_trees{'multitable'}; $result_texis{'multitable'} = '@multitable {truc} {bidule} @@ -2114,6 +2189,9 @@ A B $result_errors{'multitable'} = []; +$result_floats{'multitable'} = {}; + + $result_converted{'plaintext'}->{'multitable'} = 'truc bidule truc2 bidule2 diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl index a7517dd3c5..94f4cf1a97 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl @@ -289,6 +289,9 @@ $result_errors{'multitable_in_example_extraneous_tab'} = [ ]; +$result_floats{'multitable_in_example_extraneous_tab'} = {}; + + $result_converted{'plaintext'}->{'multitable_in_example_extraneous_tab'} = ' ita tmp diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_code_commands.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_code_commands.pl index f5241b9279..c44e682fe7 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_code_commands.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_code_commands.pl @@ -46,7 +46,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -91,7 +95,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -136,7 +144,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'command', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -181,7 +193,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -226,7 +242,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} }, { @@ -271,7 +291,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} }, { @@ -316,7 +340,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} }, { @@ -361,7 +389,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} }, { @@ -457,7 +489,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 12, + 'macro' => '' + }, 'parent' => {} }, { @@ -529,7 +565,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'command', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => '' + }, 'parent' => {} }, { @@ -574,7 +614,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 15, + 'macro' => '' + }, 'parent' => {} }, { @@ -619,7 +663,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 16, + 'macro' => '' + }, 'parent' => {} }, { @@ -664,7 +712,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 17, + 'macro' => '' + }, 'parent' => {} }, { @@ -709,7 +761,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 18, + 'macro' => '' + }, 'parent' => {} }, { @@ -754,7 +810,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 19, + 'macro' => '' + }, 'parent' => {} }, { @@ -891,7 +951,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => '' + }, 'parent' => {} }, { @@ -936,7 +1000,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'command', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 25, + 'macro' => '' + }, 'parent' => {} }, { @@ -981,7 +1049,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 26, + 'macro' => '' + }, 'parent' => {} }, { @@ -1026,7 +1098,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 27, + 'macro' => '' + }, 'parent' => {} }, { @@ -1071,7 +1147,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 28, + 'macro' => '' + }, 'parent' => {} }, { @@ -1116,7 +1196,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 29, + 'macro' => '' + }, 'parent' => {} }, { @@ -1161,7 +1245,11 @@ $result_trees{'nested_code_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 30, + 'macro' => '' + }, 'parent' => {} }, { @@ -1222,7 +1310,6 @@ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{' $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[0]; -$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]; @@ -1230,7 +1317,6 @@ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{' $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]; -$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]; @@ -1238,7 +1324,6 @@ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{' $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]; -$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]; @@ -1246,7 +1331,6 @@ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{' $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]; -$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]; @@ -1254,7 +1338,6 @@ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{' $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]; -$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]; @@ -1262,7 +1345,6 @@ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]; -$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]; @@ -1270,7 +1352,6 @@ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]{ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]; -$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[13]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]; @@ -1278,7 +1359,6 @@ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{ $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]; -$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[14]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[15]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[0]; $result_trees{'nested_code_commands'}{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}; @@ -1294,7 +1374,6 @@ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]; -$result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0]; @@ -1306,7 +1385,6 @@ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[6]; -$result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]; @@ -1314,7 +1392,6 @@ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]; -$result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]; @@ -1322,7 +1399,6 @@ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]; -$result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[0]; @@ -1330,7 +1406,6 @@ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]; -$result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]; @@ -1338,7 +1413,6 @@ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]; -$result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]; @@ -1346,7 +1420,6 @@ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]; -$result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[2]; @@ -1367,7 +1440,6 @@ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]; -$result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]; @@ -1375,7 +1447,6 @@ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]; -$result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]; @@ -1383,7 +1454,6 @@ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]; -$result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]; @@ -1391,7 +1461,6 @@ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]; -$result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]; @@ -1399,7 +1468,6 @@ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]; -$result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]{'args'}[0]; @@ -1407,7 +1475,6 @@ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]; -$result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]{'args'}[0]; @@ -1415,7 +1482,6 @@ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[ $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]{'args'}[0]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]; -$result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[15]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]; $result_trees{'nested_code_commands'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'nested_code_commands'}{'contents'}[4]; @@ -1491,6 +1557,9 @@ in code in var $result_errors{'nested_code_commands'} = []; +$result_floats{'nested_code_commands'} = {}; + + $result_converted{'plaintext'}->{'nested_code_commands'} = '\'aA fg\'. \'cc gg\'. \'in command fg\' \'in code in command\' \'in samp \'in code\'\' \'in code \'in samp\'\' IN VAR \'IN CODE\' \'in code IN VAR\' diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_indentedblock.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_indentedblock.pl index 9f089307ff..e3ace4bffe 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_indentedblock.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_indentedblock.pl @@ -342,6 +342,9 @@ in example $result_errors{'nested_indentedblock'} = []; +$result_floats{'nested_indentedblock'} = {}; + + $result_converted{'plaintext'}->{'nested_indentedblock'} = ' in example f f f``g diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_multitable.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_multitable.pl index 4b8c5c4954..ce701f91f8 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_multitable.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/nested_multitable.pl @@ -163,7 +163,11 @@ $result_trees{'nested_multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} } ], @@ -213,11 +217,15 @@ $result_trees{'nested_multitable'} = { 'max_columns' => 2, 'prototypes' => [ { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' }, { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' } ], @@ -325,7 +333,11 @@ $result_trees{'nested_multitable'} = { 'cell_number' => 2, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} } ], @@ -375,11 +387,17 @@ $result_trees{'nested_multitable'} = { 'max_columns' => 2, 'prototypes' => [ { - 'contents' => [], + 'contents' => [ + {}, + {}, + {} + ], 'type' => 'bracketed_multitable_prototype' }, { - 'contents' => [], + 'contents' => [ + {} + ], 'type' => 'bracketed_multitable_prototype' } ], @@ -417,7 +435,6 @@ $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{ $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]; -$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]; @@ -425,8 +442,8 @@ $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{ $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]; -$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}; -$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}; +$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0] = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]; @@ -439,7 +456,6 @@ $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{ $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]; -$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]; @@ -447,8 +463,10 @@ $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'con $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[1]; $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_multitable'}{'contents'}[1]; $result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[1]; -$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'} = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}; -$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'} = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}; +$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0] = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]; +$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[1] = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]; +$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[2] = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[2]; +$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0] = $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]; $result_trees{'nested_multitable'}{'contents'}[1]{'parent'} = $result_trees{'nested_multitable'}; $result_texis{'nested_multitable'} = ' @@ -472,6 +490,9 @@ other item in tab $result_errors{'nested_multitable'} = []; +$result_floats{'nested_multitable'} = {}; + + $result_converted{'plaintext'}->{'nested_multitable'} = 'AAAA machin bidule other item in tab diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_empty_line_after_section.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_empty_line_after_section.pl index a39880ef95..929d23ffb7 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_empty_line_after_section.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_empty_line_after_section.pl @@ -473,6 +473,9 @@ $result_sectioning{'no_empty_line_after_section'}{'section_childs'}[0]{'section_ $result_errors{'no_empty_line_after_section'} = []; +$result_floats{'no_empty_line_after_section'} = {}; + + $result_converted{'plaintext'}->{'no_empty_line_after_section'} = 'Text diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands.pl index cf5c3fcafd..ebb0aa13fb 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands.pl @@ -451,6 +451,9 @@ End. $result_errors{'no_punctuation_commands'} = []; +$result_floats{'no_punctuation_commands'} = {}; + + $result_converted{'plaintext'}->{'no_punctuation_commands'} = 'Dot. Exclam! Question? Dot. Exclam! Question? GAAA. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl index 2e3c4b6ba5..d947e8e458 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/no_punctuation_commands_frenchspacing.pl @@ -486,6 +486,9 @@ End. $result_errors{'no_punctuation_commands_frenchspacing'} = []; +$result_floats{'no_punctuation_commands_frenchspacing'} = {}; + + $result_converted{'plaintext'}->{'no_punctuation_commands_frenchspacing'} = 'Dot. Exclam! Question? Dot. Exclam! Question? GAAA. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/non_break_spaces.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/non_break_spaces.pl index 81921de32a..d597b32845 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/non_break_spaces.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/non_break_spaces.pl @@ -98,7 +98,9 @@ $result_trees{'non_break_spaces'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -127,7 +129,7 @@ $result_trees{'non_break_spaces'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{' $result_trees{'non_break_spaces'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'non_break_spaces'}{'contents'}[1]{'contents'}[1]; $result_trees{'non_break_spaces'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'non_break_spaces'}{'contents'}[1]; $result_trees{'non_break_spaces'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'non_break_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'non_break_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'non_break_spaces'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'non_break_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'non_break_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'non_break_spaces'}{'contents'}[1]{'parent'} = $result_trees{'non_break_spaces'}; $result_texis{'non_break_spaces'} = '@documentencoding utf-8 @@ -166,4 +168,7 @@ $result_menus{'non_break_spaces'} = { $result_errors{'non_break_spaces'} = []; +$result_floats{'non_break_spaces'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/paragraphindent.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/paragraphindent.pl index d45a85785e..6fbed83476 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/paragraphindent.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/paragraphindent.pl @@ -286,6 +286,9 @@ aaa b 7 $result_errors{'paragraphindent'} = []; +$result_floats{'paragraphindent'} = {}; + + $result_converted{'plaintext'}->{'paragraphindent'} = 'First diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/protect_spaces_on_line.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/protect_spaces_on_line.pl index 4b78220902..b8429111a7 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/protect_spaces_on_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/protect_spaces_on_line.pl @@ -60,7 +60,11 @@ $result_trees{'protect_spaces_on_line'} = { ], 'cmdname' => 'w', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -139,7 +143,11 @@ $result_trees{'protect_spaces_on_line'} = { ], 'cmdname' => 'w', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} }, { @@ -159,7 +167,11 @@ $result_trees{'protect_spaces_on_line'} = { 'extra' => { 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} }, { @@ -214,7 +226,6 @@ $result_trees{'protect_spaces_on_line'}{'contents'}[1]{'contents'}[1]{'parent'} $result_trees{'protect_spaces_on_line'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[1]; $result_trees{'protect_spaces_on_line'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[1]{'contents'}[3]{'args'}[0]; $result_trees{'protect_spaces_on_line'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[1]{'contents'}[3]; -$result_trees{'protect_spaces_on_line'}{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'protect_spaces_on_line'}{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'protect_spaces_on_line'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[1]; $result_trees{'protect_spaces_on_line'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[1]; $result_trees{'protect_spaces_on_line'}{'contents'}[1]{'parent'} = $result_trees{'protect_spaces_on_line'}; @@ -228,11 +239,9 @@ $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0] $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]; $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]; -$result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]; -$result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]; $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[2]{'args'}[0]; $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'protect_spaces_on_line'}{'contents'}[3]{'contents'}[2]; @@ -258,6 +267,9 @@ before samp. a. after samp, w in w. after dot afterw $result_errors{'protect_spaces_on_line'} = []; +$result_floats{'protect_spaces_on_line'} = {}; + + $result_converted{'plaintext'}->{'protect_spaces_on_line'} = 'Before samp. \'a\'. after samp, w in w. after dot afterw diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/protected_space_end_line.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/protected_space_end_line.pl index 177dd4a37c..77c8de47b7 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/protected_space_end_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/protected_space_end_line.pl @@ -214,6 +214,9 @@ This is a very simple texi manual followed by tab a <>. text. $result_errors{'protected_space_end_line'} = []; +$result_floats{'protected_space_end_line'} = {}; + + $result_converted{'plaintext'}->{'protected_space_end_line'} = 'First para diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation.pl index b50f8dc56b..153e971a6d 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation.pl @@ -251,6 +251,9 @@ End. $result_errors{'punctuation'} = []; +$result_floats{'punctuation'} = {}; + + $result_converted{'plaintext'}->{'punctuation'} = 'Dot. Exclam! Question? Dot. Exclam! Question? GAAA. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl index 9ad26beb45..91ec62c999 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_abbr_acronym.pl @@ -50,7 +50,11 @@ $result_trees{'punctuation_abbr_acronym'} = { ], 'cmdname' => 'acronym', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -72,7 +76,11 @@ $result_trees{'punctuation_abbr_acronym'} = { ], 'cmdname' => 'abbr', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -94,7 +102,11 @@ $result_trees{'punctuation_abbr_acronym'} = { ], 'cmdname' => 'acronym', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -169,7 +181,11 @@ $result_trees{'punctuation_abbr_acronym'} = { ], 'cmdname' => 'acronym', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -204,7 +220,11 @@ $result_trees{'punctuation_abbr_acronym'} = { ], 'cmdname' => 'abbr', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -265,17 +285,14 @@ $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[0]{'parent' $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[2]{'args'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[2]; -$result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[4]; -$result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[6]; -$result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]; @@ -288,14 +305,12 @@ $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'} $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[1]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]; -$result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'line_nr'}; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[1]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'args'}[1]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]; -$result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[8]{'line_nr'}; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[12]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[13]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]; $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_abbr_acronym'}{'contents'}[0]{'contents'}[14]{'args'}[0]; @@ -320,6 +335,9 @@ bbb (expla). Last. $result_errors{'punctuation_abbr_acronym'} = []; +$result_floats{'punctuation_abbr_acronym'} = {}; + + $result_converted{'plaintext'}->{'punctuation_abbr_acronym'} = 'AAA. BBB. aaa. bbb. Next. AAA (expL). BBB (explA). aaa (expl). bbb (expla). Last. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl index f7a3a24683..da84a31dcc 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl @@ -54,7 +54,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -64,7 +68,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -85,7 +93,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => 'aa', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -95,7 +107,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -148,7 +164,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} } ], @@ -158,7 +178,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -179,7 +203,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} } ], @@ -189,7 +217,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -246,7 +278,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -256,7 +292,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -281,7 +321,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -291,7 +335,11 @@ $result_trees{'punctuation_and_code_style_commands'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -312,17 +360,13 @@ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]; @@ -331,17 +375,13 @@ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[10]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[11]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]; @@ -351,18 +391,14 @@ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[ $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[14]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[15]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]; -$result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[16]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'contents'}[17]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]; $result_trees{'punctuation_and_code_style_commands'}{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands'}; @@ -381,6 +417,9 @@ double AAA. double E~. double AA. End. $result_errors{'punctuation_and_code_style_commands'} = []; +$result_floats{'punctuation_and_code_style_commands'} = {}; + + $result_converted{'plaintext'}->{'punctuation_and_code_style_commands'} = '\'aaa\'. \'ẽ\'. \'å\'. \'AAA\'. \'Ẽ\'. \'Å\'. \'double AAA\'. \'double Ẽ\'. \'double Å\'. End. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl index a694583098..6b5458a32a 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands_utf8.pl @@ -85,7 +85,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} } ], @@ -95,7 +99,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -116,7 +124,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => 'aa', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} } ], @@ -126,7 +138,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -179,7 +195,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -189,7 +209,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -210,7 +234,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -220,7 +248,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -277,7 +309,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} } ], @@ -287,7 +323,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -312,7 +352,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} } ], @@ -322,7 +366,11 @@ $result_trees{'punctuation_and_code_style_commands_utf8'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -346,17 +394,13 @@ $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'conten $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[6]{'args'}[0]; @@ -365,17 +409,13 @@ $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'conten $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[12]{'args'}[0]; @@ -385,18 +425,14 @@ $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'conten $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[15]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]; -$result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_code_style_commands_utf8'}{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_code_style_commands_utf8'}; @@ -416,6 +452,9 @@ double AAA. double E~. double AA. End. $result_errors{'punctuation_and_code_style_commands_utf8'} = []; +$result_floats{'punctuation_and_code_style_commands_utf8'} = {}; + + $result_converted{'plaintext'}->{'punctuation_and_code_style_commands_utf8'} = '‘aaa’. ‘ẽ’. ‘å’. ‘AAA’. ‘Ẽ’. ‘Å’. ‘double AAA’. ‘double Ẽ’. ‘double Å’. End. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl index b6b8d3bc40..0c09134ae8 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_footnotes.pl @@ -109,7 +109,11 @@ $result_trees{'punctuation_and_footnotes'} = { ], 'cmdname' => 'footnote', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -186,7 +190,11 @@ $result_trees{'punctuation_and_footnotes'} = { ], 'cmdname' => 'footnote', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} }, { @@ -524,7 +532,6 @@ $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[5]{'parent $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]; $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'args'}[0]; $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]; -$result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'line_nr'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[4]{'line_nr'}; $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]; $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[1]; $result_trees{'punctuation_and_footnotes'}{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_footnotes'}; @@ -538,7 +545,6 @@ $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[2]{'parent $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]; $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'args'}[0]; $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]; -$result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]; $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]; $result_trees{'punctuation_and_footnotes'}{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'punctuation_and_footnotes'}{'contents'}[3]; @@ -631,6 +637,9 @@ w. S3. $result_errors{'punctuation_and_footnotes'} = []; +$result_floats{'punctuation_and_footnotes'} = {}; + + $result_converted{'plaintext'}->{'punctuation_and_footnotes'} = 'Text.(1) Sentence end.(2) S2.(3) S3. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl index 0a304cb9db..50ec65d538 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_footnotes_frenchspacing.pl @@ -140,7 +140,11 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = { ], 'cmdname' => 'footnote', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -217,7 +221,11 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'} = { ], 'cmdname' => 'footnote', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} }, { @@ -558,7 +566,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'content $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]; $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'args'}[0]; $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]; -$result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'line_nr'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[4]{'line_nr'}; $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]; $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]; $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}; @@ -572,7 +579,6 @@ $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'content $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]; $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0]; $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]; -$result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]; $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]; $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]{'contents'}[5]{'parent'} = $result_trees{'punctuation_and_footnotes_frenchspacing'}{'contents'}[4]; @@ -666,6 +672,9 @@ w. S3. $result_errors{'punctuation_and_footnotes_frenchspacing'} = []; +$result_floats{'punctuation_and_footnotes_frenchspacing'} = {}; + + $result_converted{'plaintext'}->{'punctuation_and_footnotes_frenchspacing'} = 'Text.(1) Sentence end.(2) S2.(3) S3. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl index 5d4d05a7c3..21bfa2eb2d 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl @@ -60,7 +60,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} } ], @@ -70,7 +74,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -91,7 +99,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'aa', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} } ], @@ -101,7 +113,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -154,7 +170,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -164,7 +184,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -185,7 +209,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -195,7 +223,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -252,7 +284,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} } ], @@ -262,7 +298,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -287,7 +327,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} } ], @@ -297,7 +341,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -362,7 +410,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} } ], @@ -372,7 +424,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} }, { @@ -393,7 +449,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'aa', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} } ], @@ -403,7 +463,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} }, { @@ -456,7 +520,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} } ], @@ -466,7 +534,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} }, { @@ -487,7 +559,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} } ], @@ -497,7 +573,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} }, { @@ -554,7 +634,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} } ], @@ -564,7 +648,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} }, { @@ -589,7 +677,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} } ], @@ -599,7 +691,11 @@ $result_trees{'punctuation_and_upper_case_commands'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} }, { @@ -621,17 +717,13 @@ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]; @@ -640,17 +732,13 @@ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[12]{'args'}[0]; @@ -660,18 +748,14 @@ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[15]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}; @@ -682,17 +766,13 @@ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[6]{'args'}[0]; @@ -701,17 +781,13 @@ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[8]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[10]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[11]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[12]{'args'}[0]; @@ -721,18 +797,14 @@ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[ $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[14]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[15]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]; -$result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[16]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'contents'}[17]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands'}{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_upper_case_commands'}; @@ -761,6 +833,9 @@ DOUBLE AAA. DOUBLE E~. DOUBLE AA. End. $result_errors{'punctuation_and_upper_case_commands'} = []; +$result_floats{'punctuation_and_upper_case_commands'} = {}; + + $result_converted{'plaintext'}->{'punctuation_and_upper_case_commands'} = 'AAA. Ẽ. Å. AAA. Ẽ. Å. DOUBLE AAA. DOUBLE Ẽ. DOUBLE Å. End. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl index 40e146690b..d62cb05b62 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands_utf8.pl @@ -85,7 +85,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} } ], @@ -95,7 +99,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -116,7 +124,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'aa', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} } ], @@ -126,7 +138,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -179,7 +195,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -189,7 +209,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -210,7 +234,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -220,7 +248,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -277,7 +309,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} } ], @@ -287,7 +323,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -312,7 +352,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} } ], @@ -322,7 +366,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'var', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -387,7 +435,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} } ], @@ -397,7 +449,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} }, { @@ -418,7 +474,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'aa', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} } ], @@ -428,7 +488,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} }, { @@ -481,7 +545,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} } ], @@ -491,7 +559,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} }, { @@ -512,7 +584,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} } ], @@ -522,7 +598,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {} }, { @@ -579,7 +659,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} } ], @@ -589,7 +673,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} }, { @@ -614,7 +702,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'AA', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} } ], @@ -624,7 +716,11 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} }, { @@ -648,17 +744,13 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'conten $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[6]{'args'}[0]; @@ -667,17 +759,13 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'conten $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[12]{'args'}[0]; @@ -687,18 +775,14 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'conten $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[15]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}; @@ -709,17 +793,13 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'conten $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[6]{'args'}[0]; @@ -728,17 +808,13 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'conten $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[7]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[8]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[9]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[6]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[10]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[11]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[12]{'args'}[0]; @@ -748,18 +824,14 @@ $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'conten $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[14]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[15]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]; -$result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'line_nr'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[12]{'line_nr'}; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[16]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'contents'}[17]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]; $result_trees{'punctuation_and_upper_case_commands_utf8'}{'contents'}[3]{'parent'} = $result_trees{'punctuation_and_upper_case_commands_utf8'}; @@ -787,6 +859,9 @@ DOUBLE AAA. DOUBLE E~. DOUBLE AA. End. $result_errors{'punctuation_and_upper_case_commands_utf8'} = []; +$result_floats{'punctuation_and_upper_case_commands_utf8'} = {}; + + $result_converted{'plaintext'}->{'punctuation_and_upper_case_commands_utf8'} = 'AAA. Ẽ. Å. AAA. Ẽ. Å. DOUBLE AAA. DOUBLE Ẽ. DOUBLE Å. End. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_at_end_command.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_at_end_command.pl index 03f816d9a7..d08de05365 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_at_end_command.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_at_end_command.pl @@ -70,7 +70,11 @@ $result_trees{'punctuation_at_end_command'} = { ], 'cmdname' => 'dmn', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -92,7 +96,11 @@ $result_trees{'punctuation_at_end_command'} = { ], 'cmdname' => 'indicateurl', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -145,7 +153,11 @@ $result_trees{'punctuation_at_end_command'} = { ], 'cmdname' => 'math', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -167,7 +179,11 @@ $result_trees{'punctuation_at_end_command'} = { ], 'cmdname' => 'cite', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -189,7 +205,11 @@ $result_trees{'punctuation_at_end_command'} = { ], 'cmdname' => 'emph', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -234,7 +254,11 @@ $result_trees{'punctuation_at_end_command'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -256,7 +280,11 @@ $result_trees{'punctuation_at_end_command'} = { ], 'cmdname' => 'emph', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -281,12 +309,10 @@ $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[1]{'paren $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[3]{'args'}[0]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[3]; -$result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[5]{'args'}[0]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[5]; -$result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; @@ -296,17 +322,14 @@ $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[8]{'paren $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'args'}[0]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]; -$result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'line_nr'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[8]{'line_nr'}; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[12]{'args'}[0]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[12]; -$result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[12]{'line_nr'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[8]{'line_nr'}; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[14]{'args'}[0]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[14]; -$result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[14]{'line_nr'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[8]{'line_nr'}; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[15]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; @@ -314,12 +337,10 @@ $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]{'args $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[0]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]{'args'}[0]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]; -$result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]{'line_nr'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[18]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[19]{'args'}[0]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[19]; -$result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[19]{'line_nr'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[19]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'contents'}[20]{'parent'} = $result_trees{'punctuation_at_end_command'}{'contents'}[1]; $result_trees{'punctuation_at_end_command'}{'contents'}[1]{'parent'} = $result_trees{'punctuation_at_end_command'}; @@ -340,6 +361,9 @@ asis in code . text. a dot before a emph open . and in emph. $result_errors{'punctuation_at_end_command'} = []; +$result_floats{'punctuation_at_end_command'} = {}; + + $result_converted{'plaintext'}->{'punctuation_at_end_command'} = 'Text. Email . <.> dmn 1. and text. indicateurl \'.\' and then kbd \'.\' and math . and cite \'.\' and emph _._ text. asis in code \'.\' text. a diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_commands.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_commands.pl index 2567658284..d0639e461f 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_commands.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_commands.pl @@ -115,7 +115,11 @@ $result_trees{'punctuation_commands'} = { ], 'cmdname' => 'enddots', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -455,7 +459,6 @@ $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[1]{'args'}[0]{' $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'punctuation_commands'}{'contents'}[3]; $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'punctuation_commands'}{'contents'}[3]; $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[3]; -$result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'punctuation_commands'}{'contents'}[3]; $result_trees{'punctuation_commands'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'punctuation_commands'}{'contents'}[3]; $result_trees{'punctuation_commands'}{'contents'}[3]{'parent'} = $result_trees{'punctuation_commands'}; @@ -584,6 +587,9 @@ End. $result_errors{'punctuation_commands'} = []; +$result_floats{'punctuation_commands'} = {}; + + $result_converted{'plaintext'}->{'punctuation_commands'} = 'Dot. Exclam! Question? Dot. Exclam! Question? GAAA. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl index 1fef3ed4d1..e4802268e9 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_commands_frenchspacing.pl @@ -146,7 +146,11 @@ $result_trees{'punctuation_commands_frenchspacing'} = { ], 'cmdname' => 'enddots', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} }, { @@ -489,7 +493,6 @@ $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[1 $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]; $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]; $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[3]; -$result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[3]{'parent'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]; $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'contents'}[4]{'parent'} = $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]; $result_trees{'punctuation_commands_frenchspacing'}{'contents'}[4]{'parent'} = $result_trees{'punctuation_commands_frenchspacing'}; @@ -619,6 +622,9 @@ End. $result_errors{'punctuation_commands_frenchspacing'} = []; +$result_floats{'punctuation_commands_frenchspacing'} = {}; + + $result_converted{'plaintext'}->{'punctuation_commands_frenchspacing'} = 'Dot. Exclam! Question? Dot. Exclam! Question? GAAA. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl index 4bdec8200e..49ef6a7742 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_frenchspacing.pl @@ -286,6 +286,9 @@ End. $result_errors{'punctuation_frenchspacing'} = []; +$result_floats{'punctuation_frenchspacing'} = {}; + + $result_converted{'plaintext'}->{'punctuation_frenchspacing'} = 'Dot. Exclam! Question? Dot. Exclam! Question? GAAA. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command.pl index a8e7489b48..e2461b521a 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command.pl @@ -70,7 +70,11 @@ $result_trees{'punctuation_in_command'} = { ], 'cmdname' => 'dmn', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -92,7 +96,11 @@ $result_trees{'punctuation_in_command'} = { ], 'cmdname' => 'indicateurl', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -114,7 +122,11 @@ $result_trees{'punctuation_in_command'} = { ], 'cmdname' => 'kbd', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -136,7 +148,11 @@ $result_trees{'punctuation_in_command'} = { ], 'cmdname' => 'math', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -158,7 +174,11 @@ $result_trees{'punctuation_in_command'} = { ], 'cmdname' => 'cite', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -180,7 +200,11 @@ $result_trees{'punctuation_in_command'} = { ], 'cmdname' => 'emph', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -225,7 +249,11 @@ $result_trees{'punctuation_in_command'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -250,32 +278,26 @@ $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[1]{'parent'} $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[3]{'args'}[0]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[3]; -$result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[5]{'args'}[0]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[5]; -$result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[7]{'args'}[0]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[7]; -$result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[7]{'line_nr'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'args'}[0]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]; -$result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'line_nr'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[9]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[10]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[11]{'args'}[0]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[11]; -$result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[11]{'line_nr'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[13]{'args'}[0]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[13]; -$result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[13]{'line_nr'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[15]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; @@ -283,7 +305,6 @@ $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[16]{'args'}[0 $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[16]{'args'}[0]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[16]; -$result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[16]{'line_nr'} = $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[16]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[16]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'contents'}[17]{'parent'} = $result_trees{'punctuation_in_command'}{'contents'}[1]; $result_trees{'punctuation_in_command'}{'contents'}[1]{'parent'} = $result_trees{'punctuation_in_command'}; @@ -302,6 +323,9 @@ asis in code a. c $result_errors{'punctuation_in_command'} = []; +$result_floats{'punctuation_in_command'} = {}; + + $result_converted{'plaintext'}->{'punctuation_in_command'} = 'Text. Email a. b <a. b> dmn 1. 2 and text. indicateurl \'i. u\' and then kbd \'k. d\' and math m. a and cite \'c. e\' and emph _e. h_ text. diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl index 43e3adfc4f..83f0982f63 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_command_end_line.pl @@ -273,7 +273,11 @@ $result_trees{'punctuation_in_command_end_line'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {} }, { @@ -366,7 +370,6 @@ $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[22]{ $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]; $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[22]{'args'}[0]; $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[22]; -$result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[22]{'line_nr'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[22]{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]; $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[23]{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]; $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]{'contents'}[24]{'parent'} = $result_trees{'punctuation_in_command_end_line'}{'contents'}[0]; @@ -405,6 +408,9 @@ and in emph. $result_errors{'punctuation_in_command_end_line'} = []; +$result_floats{'punctuation_in_command_end_line'} = {}; + + $result_converted{'plaintext'}->{'punctuation_in_command_end_line'} = 'Text. Email . <.> dmn 1. and text. indicateurl \'.\' and then kbd \'.\' and math . and cite \'.\' and emph _._ text. asis in code \'.\' text. a diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_sc.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_sc.pl index 7338ea884d..41288754ea 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_sc.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_in_sc.pl @@ -54,7 +54,11 @@ $result_trees{'punctuation_in_sc'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -75,7 +79,6 @@ $result_trees{'punctuation_in_sc'}{'contents'}[0]{'contents'}[1]{'parent'} = $re $result_trees{'punctuation_in_sc'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'punctuation_in_sc'}{'contents'}[0]; $result_trees{'punctuation_in_sc'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_sc'}{'contents'}[0]{'contents'}[3]{'args'}[0]; $result_trees{'punctuation_in_sc'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'punctuation_in_sc'}{'contents'}[0]{'contents'}[3]; -$result_trees{'punctuation_in_sc'}{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'punctuation_in_sc'}{'contents'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'punctuation_in_sc'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'punctuation_in_sc'}{'contents'}[0]; $result_trees{'punctuation_in_sc'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'punctuation_in_sc'}{'contents'}[0]; $result_trees{'punctuation_in_sc'}{'contents'}[0]{'parent'} = $result_trees{'punctuation_in_sc'}; @@ -88,6 +91,9 @@ $result_texts{'punctuation_in_sc'} = 'one TWO. three FOUR. five'; $result_errors{'punctuation_in_sc'} = []; +$result_floats{'punctuation_in_sc'} = {}; + + $result_converted{'plaintext'}->{'punctuation_in_sc'} = 'one TWO. three FOUR. five '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/quote_node_names.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/quote_node_names.pl index 271c8f1523..42ac7c9845 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/quote_node_names.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/quote_node_names.pl @@ -37,7 +37,9 @@ $result_trees{'quote_node_names'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -127,7 +129,9 @@ $result_trees{'quote_node_names'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'normal-node' } ], @@ -275,7 +279,9 @@ $result_trees{'quote_node_names'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'blah_003ablah' } ], @@ -423,7 +429,9 @@ $result_trees{'quote_node_names'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'blumpty_002efump' } ], @@ -642,14 +650,20 @@ $result_trees{'quote_node_names'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'secret_002cnode' } ], 'normalized' => 'secret_002cnode', 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => 'nodequote.texi', + 'line_nr' => 38, + 'macro' => '' + }, 'parent' => {} }, 'node_argument' => { @@ -659,7 +673,11 @@ $result_trees{'quote_node_names'} = { 'normalized' => 'secret_002cnode' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => 'nodequote.texi', + 'line_nr' => 15, + 'macro' => '' + }, 'parent' => {} }, { @@ -818,7 +836,11 @@ $result_trees{'quote_node_names'} = { 'normalized' => 'blah_003ablah' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => 'nodequote.texi', + 'line_nr' => 20, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -915,7 +937,11 @@ $result_trees{'quote_node_names'} = { 'normalized' => 'blumpty_002efump' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => 'nodequote.texi', + 'line_nr' => 21, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -1041,7 +1067,11 @@ $result_trees{'quote_node_names'} = { ], 'cmdname' => 'asis', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => 'nodequote.texi', + 'line_nr' => 23, + 'macro' => '' + }, 'parent' => {} } ], @@ -1081,7 +1111,11 @@ $result_trees{'quote_node_names'} = { 'normalized' => 'secret_002cnode' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => 'nodequote.texi', + 'line_nr' => 23, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -1343,7 +1377,11 @@ $result_trees{'quote_node_names'} = { 'spaces_before_argument' => ' ' }, 'level' => 1, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => 'nodequote.texi', + 'line_nr' => 39, + 'macro' => '' + }, 'number' => 4, 'parent' => {} }, @@ -1390,7 +1428,9 @@ $result_trees{'quote_node_names'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'top-secret-node' } ], @@ -1411,7 +1451,7 @@ $result_trees{'quote_node_names'}{'contents'}[0]{'parent'} = $result_trees{'quot $result_trees{'quote_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[1]{'args'}[0]; $result_trees{'quote_node_names'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[1]; $result_trees{'quote_node_names'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'quote_node_names'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'quote_node_names'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'quote_node_names'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[1]{'parent'} = $result_trees{'quote_node_names'}; $result_trees{'quote_node_names'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]; @@ -1422,7 +1462,7 @@ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{' $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; -$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}; +$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'} = $result_trees{'quote_node_names'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]; @@ -1444,7 +1484,7 @@ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{' $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; -$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}; +$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'parent'} = $result_trees{'quote_node_names'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]; @@ -1466,7 +1506,7 @@ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{' $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'args'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; -$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}; +$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'parent'} = $result_trees{'quote_node_names'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]; @@ -1498,11 +1538,9 @@ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{' $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; -$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}; -$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'line_nr'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]{'line_nr'}; +$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'} = $result_trees{'quote_node_names'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]; -$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'line_nr'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]; @@ -1533,7 +1571,6 @@ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'args'}[1]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[1] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'args'}[1]{'contents'}[1]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[2] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'args'}[1]{'contents'}[2]; -$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'line_nr'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'args'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[1]; @@ -1554,7 +1591,6 @@ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[3]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[1] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[3]{'contents'}[1]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[2] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[3]{'contents'}[2]; -$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'line_nr'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'args'}[3]{'contents'}[1]{'line_nr'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[3]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'args'}[1]; @@ -1576,7 +1612,6 @@ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[3]{'contents'}[0]{'args'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[3]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[3]{'contents'}[0]; -$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[3]{'contents'}[0]{'line_nr'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[3]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[3]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[4]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]; @@ -1586,7 +1621,6 @@ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{ $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'extra'}{'menu_entry_description'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[5]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'extra'}{'menu_entry_name'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[1]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[3]{'contents'}[0]; -$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'line_nr'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'args'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[5]; @@ -1622,7 +1656,6 @@ $result_trees{'quote_node_names'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'arg $result_trees{'quote_node_names'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[10]{'args'}[0]; $result_trees{'quote_node_names'}{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[10]; $result_trees{'quote_node_names'}{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[10]; -$result_trees{'quote_node_names'}{'contents'}[10]{'line_nr'} = $result_trees{'quote_node_names'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'quote_node_names'}{'contents'}[10]{'parent'} = $result_trees{'quote_node_names'}; $result_trees{'quote_node_names'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[11]{'args'}[0]; $result_trees{'quote_node_names'}{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[11]; @@ -1630,7 +1663,7 @@ $result_trees{'quote_node_names'}{'contents'}[11]{'contents'}[0]{'parent'} = $re $result_trees{'quote_node_names'}{'contents'}[11]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[11]{'contents'}[1]; $result_trees{'quote_node_names'}{'contents'}[11]{'contents'}[1]{'parent'} = $result_trees{'quote_node_names'}{'contents'}[11]; $result_trees{'quote_node_names'}{'contents'}[11]{'extra'}{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[11]{'args'}[0]{'contents'}[0]; -$result_trees{'quote_node_names'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'quote_node_names'}{'contents'}[11]{'extra'}{'node_content'}; +$result_trees{'quote_node_names'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'quote_node_names'}{'contents'}[11]{'args'}[0]{'contents'}[0]; $result_trees{'quote_node_names'}{'contents'}[11]{'parent'} = $result_trees{'quote_node_names'}; $result_texis{'quote_node_names'} = '@node Top @@ -2018,10 +2051,22 @@ $result_errors{'quote_node_names'} = [ 'macro' => '', 'text' => '@menu entry node name `blumpty@asis{.}fump\' different from node name `blumpty.fump\'', 'type' => 'warning' + }, + { + 'error_line' => 'nodequote.texi:41: warning: node `top secret node\' unreferenced +', + 'file_name' => 'nodequote.texi', + 'line_nr' => 41, + 'macro' => '', + 'text' => 'node `top secret node\' unreferenced', + 'type' => 'warning' } ]; +$result_floats{'quote_node_names'} = {}; + + $result_converted_errors{'file_plaintext'}->{'quote_node_names'} = [ { 'error_line' => 'nodequote.texi:4: warning: `.\' or `,\' must follow @xref diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl index fb1e7426d1..5f51ec29e1 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl @@ -94,6 +94,9 @@ $result_texts{'sc_with_utf8_enable_encoding'} = 'IN SC. $result_errors{'sc_with_utf8_enable_encoding'} = []; +$result_floats{'sc_with_utf8_enable_encoding'} = {}; + + $result_converted{'plaintext'}->{'sc_with_utf8_enable_encoding'} = 'IN SC. '; diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/settitle_and_empty_top.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/settitle_and_empty_top.pl index 1f9237d80f..c0d6e15341 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/settitle_and_empty_top.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/settitle_and_empty_top.pl @@ -114,6 +114,9 @@ $result_sectioning{'settitle_and_empty_top'}{'section_childs'}[0]{'section_up'} $result_errors{'settitle_and_empty_top'} = []; +$result_floats{'settitle_and_empty_top'} = {}; + + $result_converted{'plaintext'}->{'settitle_and_empty_top'} = 'Title ***** diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl index 11a882237f..50858b47ed 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/sp_with_text_before_in_example.pl @@ -149,6 +149,9 @@ text $result_errors{'sp_with_text_before_in_example'} = []; +$result_floats{'sp_with_text_before_in_example'} = {}; + + $result_converted{'plaintext'}->{'sp_with_text_before_in_example'} = ' sp diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/star_at_command_formatting.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/star_at_command_formatting.pl index 7bba8ad537..29a46fd44d 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/star_at_command_formatting.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/star_at_command_formatting.pl @@ -1433,9 +1433,12 @@ And end para. $result_errors{'star_at_command_formatting'} = []; +$result_floats{'star_at_command_formatting'} = {}; + + $result_converted{'plaintext'}->{'star_at_command_formatting'} = 'Some text -more text. Even more text. +more text. Even more text. not at eol. Now followed by @ : followed @@ -1467,7 +1470,7 @@ And end para. And end para. Quotation Some text - more text. Even more text. + more text. Even more text. not at eol. Now followed by @ : followed diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/tab_in_table_in_example.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/tab_in_table_in_example.pl index 8eb9e2d587..b0452c0eb0 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/tab_in_table_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/tab_in_table_in_example.pl @@ -176,7 +176,11 @@ $result_trees{'tab_in_table_in_example'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -247,7 +251,6 @@ $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]; $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]; -$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]; $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]; $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[2]; @@ -294,6 +297,9 @@ $result_errors{'tab_in_table_in_example'} = [ ]; +$result_floats{'tab_in_table_in_example'} = {}; + + $result_converted{'plaintext'}->{'tab_in_table_in_example'} = ' in tab \'table item\' diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/tab_item_in_example.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/tab_item_in_example.pl index 74481b9351..e2b936c8c1 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/tab_item_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/tab_item_in_example.pl @@ -142,6 +142,9 @@ $result_errors{'tab_item_in_example'} = [ ]; +$result_floats{'tab_item_in_example'} = {}; + + $result_converted{'plaintext'}->{'tab_item_in_example'} = ' in tab in item diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/transparent_text.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/transparent_text.pl index 3bbe3ec59b..3fd72547a7 100644 --- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/transparent_text.pl +++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/transparent_text.pl @@ -60,7 +60,11 @@ $result_trees{'transparent_text'} = { ], 'cmdname' => 'emph', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -83,7 +87,6 @@ $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[1]{'parent'} = $res $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'transparent_text'}{'contents'}[0]; $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[3]{'args'}[0]; $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[3]; -$result_trees{'transparent_text'}{'contents'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'transparent_text'}{'contents'}[0]; $result_trees{'transparent_text'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'transparent_text'}{'contents'}[0]; $result_trees{'transparent_text'}{'contents'}[0]{'parent'} = $result_trees{'transparent_text'}; @@ -98,6 +101,9 @@ $result_texts{'transparent_text'} = 'AA). B (C). D. $result_errors{'transparent_text'} = []; +$result_floats{'transparent_text'} = {}; + + $result_converted{'plaintext'}->{'transparent_text'} = 'AA(1)). B (_C_). D. |