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/coverage_braces | |
parent | 03fa062b03ce2bb5385f8f30888f94d441fa5cb4 (diff) |
CTAN sync 202107040301
Diffstat (limited to 'macros/texinfo/texinfo/tp/t/results/coverage_braces')
51 files changed, 992 insertions, 328 deletions
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl index 207a188c9c..c8ff3503cb 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl @@ -125,7 +125,11 @@ $result_trees{'abbr_acronym'} = { ], 'cmdname' => 'enddots', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -135,7 +139,11 @@ $result_trees{'abbr_acronym'} = { ], 'cmdname' => 'acronym', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -183,7 +191,11 @@ $result_trees{'abbr_acronym'} = { ], 'cmdname' => 'comma', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -211,7 +223,11 @@ $result_trees{'abbr_acronym'} = { ], 'cmdname' => '\'', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -228,7 +244,11 @@ $result_trees{'abbr_acronym'} = { ], 'cmdname' => 'comma', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -250,7 +270,11 @@ $result_trees{'abbr_acronym'} = { ], 'cmdname' => 'b', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} } ], @@ -264,7 +288,11 @@ $result_trees{'abbr_acronym'} = { ], 'cmdname' => 'abbr', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {} }, { @@ -312,7 +340,11 @@ $result_trees{'abbr_acronym'} = { ], 'cmdname' => 'comma', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} }, { @@ -329,7 +361,11 @@ $result_trees{'abbr_acronym'} = { 'extra' => { 'explanation_contents' => [] }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} }, { @@ -362,10 +398,8 @@ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[3]; -$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]; -$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]; @@ -373,25 +407,20 @@ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]; -$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[0]{'args'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[0]; -$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[0]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[2]; -$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[2]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[3]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4]{'args'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4]; -$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[4]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]; -$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[7]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]; @@ -399,12 +428,10 @@ $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2]; -$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'extra'}{'explanation_contents'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}; -$result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[8]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'contents'}[9]{'parent'} = $result_trees{'abbr_acronym'}{'contents'}[0]; $result_trees{'abbr_acronym'}{'contents'}[0]{'parent'} = $result_trees{'abbr_acronym'}; @@ -427,6 +454,9 @@ E\'-a. ,A. $result_errors{'abbr_acronym'} = []; +$result_floats{'abbr_acronym'} = {}; + + $result_converted{'plaintext'}->{'abbr_acronym'} = '-a (an accronym) -a -a (an accronym , ...) É-a. ,A. (Étude-, Autonome) É-a. ,A. diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/anchor_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/anchor_not_closed.pl index f8f278d6e5..771f73e70b 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/anchor_not_closed.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/anchor_not_closed.pl @@ -64,4 +64,7 @@ $result_errors{'anchor_not_closed'} = [ ]; +$result_floats{'anchor_not_closed'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/brace_opened_no_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/brace_opened_no_command.pl index c63d20518f..f20a61be7d 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/brace_opened_no_command.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/brace_opened_no_command.pl @@ -104,4 +104,7 @@ $result_errors{'brace_opened_no_command'} = [ ]; +$result_floats{'brace_opened_no_command'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/caption_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/caption_not_closed.pl index bad16cd937..b2c0a95474 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/caption_not_closed.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/caption_not_closed.pl @@ -144,7 +144,9 @@ $result_trees{'caption_not_closed'} = { 'end_command' => {}, 'spaces_before_argument' => ' ', 'type' => { - 'content' => [], + 'content' => [ + {} + ], 'normalized' => 'Text' } }, @@ -198,7 +200,7 @@ $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'pa $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'caption_not_closed'}{'contents'}[0]; $result_trees{'caption_not_closed'}{'contents'}[0]{'extra'}{'caption'} = $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]; $result_trees{'caption_not_closed'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[2]; -$result_trees{'caption_not_closed'}{'contents'}[0]{'extra'}{'type'}{'content'} = $result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}; +$result_trees{'caption_not_closed'}{'contents'}[0]{'extra'}{'type'}{'content'}[0] = $result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[0]; $result_trees{'caption_not_closed'}{'contents'}[0]{'parent'} = $result_trees{'caption_not_closed'}; $result_trees{'caption_not_closed'}{'contents'}[1]{'parent'} = $result_trees{'caption_not_closed'}; $result_trees{'caption_not_closed'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'caption_not_closed'}{'contents'}[2]; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/code_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/code_not_closed.pl index 532e02bc72..243f5ff8c7 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/code_not_closed.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/code_not_closed.pl @@ -61,4 +61,7 @@ $result_errors{'code_not_closed'} = [ ]; +$result_floats{'code_not_closed'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/email_possibilities.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/email_possibilities.pl index 2b174adbe0..a781813bd3 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/email_possibilities.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/email_possibilities.pl @@ -143,6 +143,9 @@ $result_texts{'email_possibilities'} = '-b $result_errors{'email_possibilities'} = []; +$result_floats{'email_possibilities'} = {}; + + $result_converted{'plaintext'}->{'email_possibilities'} = '-b <--a> -b <--a> '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl index ebbc0b3962..14e4bd2b31 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl @@ -71,7 +71,11 @@ $result_trees{'empty_commands'} = { 'extra' => { 'explanation_contents' => [] }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -88,7 +92,11 @@ $result_trees{'empty_commands'} = { ], 'cmdname' => 'email', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -105,7 +113,11 @@ $result_trees{'empty_commands'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -118,7 +130,11 @@ $result_trees{'empty_commands'} = { ], 'cmdname' => 'footnote', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -135,7 +151,11 @@ $result_trees{'empty_commands'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -152,7 +172,11 @@ $result_trees{'empty_commands'} = { ], 'cmdname' => 'dotless', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -172,7 +196,11 @@ $result_trees{'empty_commands'} = { 'extra' => { 'delimiter' => ';' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -195,30 +223,23 @@ $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[2]; -$result_trees{'empty_commands'}{'contents'}[3]{'contents'}[2]{'line_nr'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[4]; -$result_trees{'empty_commands'}{'contents'}[3]{'contents'}[4]{'line_nr'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[6]; -$result_trees{'empty_commands'}{'contents'}[3]{'contents'}[6]{'line_nr'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[6]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[7]; -$result_trees{'empty_commands'}{'contents'}[3]{'contents'}[7]{'line_nr'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[7]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[8]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[9]; -$result_trees{'empty_commands'}{'contents'}[3]{'contents'}[9]{'line_nr'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[9]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[10]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[11]; -$result_trees{'empty_commands'}{'contents'}[3]{'contents'}[11]{'line_nr'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[11]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[12]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[13]; -$result_trees{'empty_commands'}{'contents'}[3]{'contents'}[13]{'line_nr'} = $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[0]{'line_nr'}; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[13]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'contents'}[14]{'parent'} = $result_trees{'empty_commands'}{'contents'}[3]; $result_trees{'empty_commands'}{'contents'}[3]{'parent'} = $result_trees{'empty_commands'}; @@ -247,8 +268,12 @@ $result_errors{'empty_commands'} = [ ]; +$result_floats{'empty_commands'} = {}; + + -$result_converted{'plaintext'}->{'empty_commands'} = '\'\'(1) ̃ +$result_converted{'plaintext'}->{'empty_commands'} = ' +\'\'(1) ̃ ---------- Footnotes ---------- @@ -263,7 +288,7 @@ $result_converted{'html_text'}->{'empty_commands'} = ' <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> </div> '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_images.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_images.pl index d438fd8d1d..9c71242665 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_images.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_images.pl @@ -296,4 +296,7 @@ $result_errors{'empty_images'} = [ ]; +$result_floats{'empty_images'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_line_in_anchor.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_line_in_anchor.pl index 731ddf7a08..2e0dd24dc3 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_line_in_anchor.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_line_in_anchor.pl @@ -88,4 +88,7 @@ $result_errors{'empty_line_in_anchor'} = [ ]; +$result_floats{'empty_line_in_anchor'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_line_in_math.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_line_in_math.pl new file mode 100644 index 0000000000..65da54891f --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_line_in_math.pl @@ -0,0 +1,74 @@ +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{'empty_line_in_math'} = { + 'contents' => [ + { + 'contents' => [ + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'a +' + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'parent' => {}, + 'text' => 'b' + } + ], + 'parent' => {}, + 'type' => 'brace_command_context' + } + ], + 'cmdname' => 'math', + 'contents' => [], + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'parent' => {}, + 'type' => 'paragraph' + } + ], + 'type' => 'text_root' +}; +$result_trees{'empty_line_in_math'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_line_in_math'}{'contents'}[0]{'contents'}[0]{'args'}[0]; +$result_trees{'empty_line_in_math'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'empty_line_in_math'}{'contents'}[0]{'contents'}[0]{'args'}[0]; +$result_trees{'empty_line_in_math'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'empty_line_in_math'}{'contents'}[0]{'contents'}[0]{'args'}[0]; +$result_trees{'empty_line_in_math'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'empty_line_in_math'}{'contents'}[0]{'contents'}[0]; +$result_trees{'empty_line_in_math'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_line_in_math'}{'contents'}[0]; +$result_trees{'empty_line_in_math'}{'contents'}[0]{'parent'} = $result_trees{'empty_line_in_math'}; + +$result_texis{'empty_line_in_math'} = '@math{a + +b}'; + + +$result_texts{'empty_line_in_math'} = 'a + +b'; + +$result_errors{'empty_line_in_math'} = []; + + +$result_floats{'empty_line_in_math'} = {}; + + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_ref.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_ref.pl index c2e387357a..2187b27a46 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_ref.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_ref.pl @@ -61,7 +61,11 @@ $result_trees{'empty_ref'} = { ], 'cmdname' => 'xref', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -81,7 +85,11 @@ $result_trees{'empty_ref'} = { ], 'cmdname' => 'inforef', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -146,11 +154,9 @@ $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[2]; $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[2]{'args'}[2]; $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[2]; -$result_trees{'empty_ref'}{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]; $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]; $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[4]; -$result_trees{'empty_ref'}{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]; $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]; $result_trees{'empty_ref'}{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'empty_ref'}{'contents'}[1]; @@ -192,6 +198,15 @@ $result_errors{'empty_ref'} = [ 'type' => 'warning' }, { + 'error_line' => ':2: warning: @inforef is obsolete. +', + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '', + 'text' => '@inforef is obsolete.', + 'type' => 'warning' + }, + { 'error_line' => ':2: warning: command @inforef missing a node or external manual argument ', 'file_name' => '', @@ -201,6 +216,15 @@ $result_errors{'empty_ref'} = [ 'type' => 'warning' }, { + 'error_line' => ':3: warning: @inforef is obsolete. +', + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '', + 'text' => '@inforef is obsolete.', + 'type' => 'warning' + }, + { 'error_line' => ':3: warning: command @inforef missing a node or external manual argument ', 'file_name' => '', @@ -212,4 +236,7 @@ $result_errors{'empty_ref'} = [ ]; +$result_floats{'empty_ref'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_second_email_argument.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_second_email_argument.pl index ff497eeba0..b215c25b93 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_second_email_argument.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_second_email_argument.pl @@ -73,6 +73,9 @@ $result_texts{'empty_second_email_argument'} = 'a@b.c'; $result_errors{'empty_second_email_argument'} = []; +$result_floats{'empty_second_email_argument'} = {}; + + $result_converted{'plaintext'}->{'empty_second_email_argument'} = '<a@b.c> '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/end_line_in_anchor.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/end_line_in_anchor.pl index 2961b1e9ed..8ace3215f2 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/end_line_in_anchor.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/end_line_in_anchor.pl @@ -68,6 +68,9 @@ $result_texts{'end_line_in_anchor'} = ''; $result_errors{'end_line_in_anchor'} = []; +$result_floats{'end_line_in_anchor'} = {}; + + $result_converted{'plaintext'}->{'end_line_in_anchor'} = ''; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl index 1075e9cf7e..1b78207b3e 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl @@ -115,6 +115,9 @@ $result_texts{'footnote'} = 'text after footnote.'; $result_errors{'footnote'} = []; +$result_floats{'footnote'} = {}; + + $result_converted{'plaintext'}->{'footnote'} = 'text(1) after footnote. @@ -131,7 +134,7 @@ $result_converted{'html_text'}->{'footnote'} = '<p>text<a id="DOCF1" href="#FOOT <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> <p>in footnote. </p> <p><span class="roman">in footnote r</span>. </p> diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl index 2cc62fc418..689b70f145 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl @@ -76,6 +76,9 @@ $result_texts{'footnote_ending_on_empty_line'} = 'text'; $result_errors{'footnote_ending_on_empty_line'} = []; +$result_floats{'footnote_ending_on_empty_line'} = {}; + + $result_converted{'plaintext'}->{'footnote_ending_on_empty_line'} = 'text(1) @@ -90,7 +93,7 @@ $result_converted{'html_text'}->{'footnote_ending_on_empty_line'} = '<p>text<a i <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> <p>in footnote. </p> </div> diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl index 4e665fc52a..d44f6ecd49 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_in_command_not_closed.pl @@ -56,7 +56,11 @@ $result_trees{'footnote_in_command_not_closed'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -73,7 +77,6 @@ $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'a $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]; $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]; $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]; -$result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]; $result_trees{'footnote_in_command_not_closed'}{'contents'}[0]{'parent'} = $result_trees{'footnote_in_command_not_closed'}; @@ -104,4 +107,7 @@ $result_errors{'footnote_in_command_not_closed'} = [ ]; +$result_floats{'footnote_in_command_not_closed'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl index e1cf312696..b91a3462ef 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl @@ -138,6 +138,9 @@ $result_sectioning{'footnote_no_node'}{'section_childs'}[0]{'section_up'} = $res $result_errors{'footnote_no_node'} = []; +$result_floats{'footnote_no_node'} = {}; + + $result_converted{'plaintext'}->{'footnote_no_node'} = 'top *** @@ -151,17 +154,18 @@ F(1). '; -$result_converted{'html_text'}->{'footnote_no_node'} = '<span id="top"></span><h1 class="top">top</h1> +$result_converted{'html_text'}->{'footnote_no_node'} = '<div class="top" id="top"> +<h1 class="top">top</h1> <p>F<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>. </p><div class="footnote"> <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> <p>In footnote</p> </div> -<hr> +<hr></div> '; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_not_closed.pl index 4f6ed8fc80..0285f9d73d 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_not_closed.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_not_closed.pl @@ -100,4 +100,7 @@ $result_errors{'footnote_not_closed'} = [ ]; +$result_floats{'footnote_not_closed'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl index e158e00fef..4b3e263fa5 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl @@ -56,7 +56,11 @@ $result_trees{'form_feed_in_brace_commands'} = { ], 'normalized' => 'aa' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -110,7 +114,11 @@ $result_trees{'form_feed_in_brace_commands'} = { ], 'cmdname' => 'email', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -148,7 +156,11 @@ $result_trees{'form_feed_in_brace_commands'} = { 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -220,7 +232,6 @@ $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[1]{'pare $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}; @@ -230,14 +241,12 @@ $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]; -$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]; -$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'line_nr'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]; $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]; @@ -261,6 +270,9 @@ $result_texts{'form_feed_in_brace_commands'} = ' aa something fff . $result_errors{'form_feed_in_brace_commands'} = []; +$result_floats{'form_feed_in_brace_commands'} = {}; + + $result_converted{'xml'}->{'form_feed_in_brace_commands'} = '<para><option> &formfeed;aa</option> <anchor name="aa">aa</anchor></para>&formfeed;<para>something <email><emailaddress spaces="\\f">aaa</emailaddress><emailname spaces=" \\f ">fff</emailname></email><footnote spaces=" \\n">&formfeed; <para>f1 </para>&formfeed;</footnote> <footnote spaces=" \\f "><para>gg</para>&formfeed;<para>jj</para></footnote>. </para>'; @@ -286,9 +298,9 @@ $result_converted{'html_text'}->{'form_feed_in_brace_commands'} = '<p><samp>  <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> <p>f1 </p> -<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3> +<h5><a id="FOOT2" href="#DOCF2">(2)</a></h5> <p>gg</p><p>jj</p> </div> '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl index c934c03953..3a2fba51a6 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl @@ -88,7 +88,11 @@ $result_trees{'format_on_first_footnote_line'} = { ], 'cmdname' => 'footnote', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -193,7 +197,11 @@ $result_trees{'format_on_first_footnote_line'} = { ], 'cmdname' => 'footnote', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {} }, { @@ -219,7 +227,6 @@ $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'ar $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[2]; $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]; $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]; -$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]; $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]; $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'parent'} = $result_trees{'format_on_first_footnote_line'}; @@ -236,7 +243,6 @@ $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'ar $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]; $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]; $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]; -$result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2]; $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'format_on_first_footnote_line'}{'contents'}[2]; $result_trees{'format_on_first_footnote_line'}{'contents'}[2]{'parent'} = $result_trees{'format_on_first_footnote_line'}; @@ -262,6 +268,9 @@ Last text $result_errors{'format_on_first_footnote_line'} = []; +$result_floats{'format_on_first_footnote_line'} = {}; + + $result_converted{'plaintext'}->{'format_on_first_footnote_line'} = 'Texte(1). @@ -283,11 +292,11 @@ $result_converted{'html_text'}->{'format_on_first_footnote_line'} = '<p>Texte<a <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> <blockquote> <p>in quotation on the first footnote line </p></blockquote> -<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3> +<h5><a id="FOOT2" href="#DOCF2">(2)</a></h5> <div class="example"> <pre class="example">in example </pre></div> diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl index acf2eeb823..4bcd554f07 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl @@ -182,6 +182,9 @@ $result_errors{'heading_in_footnote'} = [ ]; +$result_floats{'heading_in_footnote'} = {}; + + $result_converted{'plaintext'}->{'heading_in_footnote'} = 'T(1) @@ -202,7 +205,7 @@ $result_converted{'html_text'}->{'heading_in_footnote'} = '<p>T<a id="DOCF1" hre <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> <p>AAA </p><span id="H1"></span><h3 class="heading">H1</h3> <span id="index-ind-e"></span> diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/inforef_too_much_args.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/inforef_too_much_args.pl index ca9a7976cf..9f74e38b71 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/inforef_too_much_args.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/inforef_too_much_args.pl @@ -110,7 +110,9 @@ $result_trees{'inforef_too_much_args'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'chapter' } ], @@ -142,7 +144,7 @@ $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'} $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]; $result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]; $result_trees{'inforef_too_much_args'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'inforef_too_much_args'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'inforef_too_much_args'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'inforef_too_much_args'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'inforef_too_much_args'}{'contents'}[1]{'parent'} = $result_trees{'inforef_too_much_args'}; $result_texis{'inforef_too_much_args'} = '@node chapter @@ -173,7 +175,20 @@ $result_menus{'inforef_too_much_args'} = { } }; -$result_errors{'inforef_too_much_args'} = []; +$result_errors{'inforef_too_much_args'} = [ + { + 'error_line' => ':3: warning: @inforef is obsolete. +', + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '', + 'text' => '@inforef is obsolete.', + 'type' => 'warning' + } +]; + + +$result_floats{'inforef_too_much_args'} = {}; @@ -183,8 +198,7 @@ $result_converted{'plaintext'}->{'inforef_too_much_args'} = '*note cross ref nam $result_converted{'html_text'}->{'inforef_too_much_args'} = '<span id="chapter"></span><h4 class="node-heading">chapter</h4> -<p>See <a href="file name, spurious arg.html#chapter">(file name, spurious arg)cross ref name</a> -</p><hr> -'; +<p>See <a data-manual="file name, spurious arg" href="file name, spurious arg.html#chapter">(file name, spurious arg)cross ref name</a> +</p><hr>'; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/kbd.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/kbd.pl index 105fbc431f..75acd454f0 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/kbd.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/kbd.pl @@ -93,7 +93,11 @@ $result_trees{'kbd'} = { ], 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -154,7 +158,11 @@ $result_trees{'kbd'} = { ], 'cmdname' => 'kbd', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} }, { @@ -426,7 +434,6 @@ $result_trees{'kbd'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'ar $result_trees{'kbd'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'kbd'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]; $result_trees{'kbd'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'kbd'}{'contents'}[2]{'contents'}[1]{'args'}[0]; $result_trees{'kbd'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'kbd'}{'contents'}[2]{'contents'}[1]; -$result_trees{'kbd'}{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'kbd'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'kbd'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'kbd'}{'contents'}[2]; $result_trees{'kbd'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'kbd'}{'contents'}[2]; $result_trees{'kbd'}{'contents'}[2]{'parent'} = $result_trees{'kbd'}; @@ -437,7 +444,6 @@ $result_trees{'kbd'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'ar $result_trees{'kbd'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'kbd'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]; $result_trees{'kbd'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'kbd'}{'contents'}[4]{'contents'}[1]{'args'}[0]; $result_trees{'kbd'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'kbd'}{'contents'}[4]{'contents'}[1]; -$result_trees{'kbd'}{'contents'}[4]{'contents'}[1]{'line_nr'} = $result_trees{'kbd'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'kbd'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'kbd'}{'contents'}[4]; $result_trees{'kbd'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'kbd'}{'contents'}[4]; $result_trees{'kbd'}{'contents'}[4]{'parent'} = $result_trees{'kbd'}; @@ -522,6 +528,9 @@ in format in kbd. $result_errors{'kbd'} = []; +$result_floats{'kbd'} = {}; + + $result_converted{'plaintext'}->{'kbd'} = 'kbd: \'in kbd\'. diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl index 659224e377..eb43afbcd0 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_inside_not_closed.pl @@ -39,7 +39,11 @@ $result_trees{'math_bracketed_inside_not_closed'} = { 'text' => '\\tan' } ], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {}, 'type' => 'bracketed' } @@ -50,7 +54,11 @@ $result_trees{'math_bracketed_inside_not_closed'} = { ], 'cmdname' => 'math', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -64,10 +72,8 @@ $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{ $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]; -$result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]; -$result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]; $result_trees{'math_bracketed_inside_not_closed'}{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_inside_not_closed'}; @@ -89,4 +95,7 @@ $result_errors{'math_bracketed_inside_not_closed'} = [ ]; +$result_floats{'math_bracketed_inside_not_closed'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_not_closed.pl index 7d661f3702..1958607a93 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_not_closed.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_not_closed.pl @@ -39,7 +39,11 @@ $result_trees{'math_bracketed_not_closed'} = { 'text' => '\\tan ' } ], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {}, 'type' => 'bracketed' } @@ -50,7 +54,11 @@ $result_trees{'math_bracketed_not_closed'} = { ], 'cmdname' => 'math', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -64,10 +72,8 @@ $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'} $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]; -$result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]; -$result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed'}{'contents'}[0]; $result_trees{'math_bracketed_not_closed'}{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed'}; @@ -98,4 +104,7 @@ $result_errors{'math_bracketed_not_closed'} = [ ]; +$result_floats{'math_bracketed_not_closed'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl index f8bf520edc..b57a83e5ec 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_bracketed_not_closed_next_line.pl @@ -46,7 +46,11 @@ $result_trees{'math_bracketed_not_closed_next_line'} = { ], 'cmdname' => 'math', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -61,7 +65,6 @@ $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[ $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]; $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]; -$result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]; $result_trees{'math_bracketed_not_closed_next_line'}{'contents'}[0]{'parent'} = $result_trees{'math_bracketed_not_closed_next_line'}; @@ -96,4 +99,7 @@ $result_errors{'math_bracketed_not_closed_next_line'} = [ ]; +$result_floats{'math_bracketed_not_closed_next_line'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_not_closed.pl index ad88cc5ff9..4fd327c901 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_not_closed.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/math_not_closed.pl @@ -61,4 +61,7 @@ $result_errors{'math_not_closed'} = [ ]; +$result_floats{'math_not_closed'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested.pl index bf792b8a31..930f58542e 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested.pl @@ -50,7 +50,11 @@ $result_trees{'nested'} = { ], 'cmdname' => 'kbd', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -70,7 +74,6 @@ $result_trees{'nested'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{ $result_trees{'nested'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]; $result_trees{'nested'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested'}{'contents'}[0]{'contents'}[1]{'args'}[0]; $result_trees{'nested'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested'}{'contents'}[0]{'contents'}[1]; -$result_trees{'nested'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'nested'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested'}{'contents'}[0]; $result_trees{'nested'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested'}{'contents'}[0]; $result_trees{'nested'}{'contents'}[0]{'parent'} = $result_trees{'nested'}; @@ -83,6 +86,9 @@ $result_texts{'nested'} = 'type the characters l o g o u t RET.'; $result_errors{'nested'} = []; +$result_floats{'nested'} = {}; + + $result_converted{'plaintext'}->{'nested'} = 'type the characters \'l o g o u t <RET>\'. '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_args.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_args.pl index f03c16e014..ada76650cf 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_args.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_args.pl @@ -68,7 +68,11 @@ $result_trees{'nested_args'} = { ], 'cmdname' => 'b', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -99,7 +103,11 @@ $result_trees{'nested_args'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -157,7 +165,11 @@ $result_trees{'nested_args'} = { ] } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -180,13 +192,11 @@ $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]; -$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'args'}[0]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]; -$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[2]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]; @@ -197,7 +207,6 @@ $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'parent'} $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]; -$result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'}; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]; $result_trees{'nested_args'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_args'}{'contents'}[0]; $result_trees{'nested_args'}{'contents'}[0]{'parent'} = $result_trees{'nested_args'}; @@ -211,11 +220,14 @@ $result_texts{'nested_args'} = '@ in samp.'; $result_errors{'nested_args'} = []; +$result_floats{'nested_args'} = {}; + + $result_converted{'plaintext'}->{'nested_args'} = '*Note descr in b: (\'manual\')@ in samp. '; -$result_converted{'html_text'}->{'nested_args'} = '<p>See <a href="manual.html#g_t_0040-in-samp">(manual)Sẽction</a>.</p>'; +$result_converted{'html_text'}->{'nested_args'} = '<p>See <a data-manual="manual" href="manual.html#g_t_0040-in-samp">(manual)Sẽction</a>.</p>'; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl index 1ab5d41235..3210ed5bc6 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl @@ -57,7 +57,11 @@ $result_trees{'nested_in_sc'} = { ], 'cmdname' => 'aa', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -74,7 +78,11 @@ $result_trees{'nested_in_sc'} = { ], 'cmdname' => 'TeX', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -95,7 +103,11 @@ $result_trees{'nested_in_sc'} = { ], 'cmdname' => 'aa', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -105,7 +117,11 @@ $result_trees{'nested_in_sc'} = { ], 'cmdname' => '~', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -133,7 +149,11 @@ $result_trees{'nested_in_sc'} = { ], 'cmdname' => 'footnote', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -168,7 +188,11 @@ $result_trees{'nested_in_sc'} = { ], 'cmdname' => 'abbr', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -209,7 +233,11 @@ $result_trees{'nested_in_sc'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -219,7 +247,11 @@ $result_trees{'nested_in_sc'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -240,41 +272,33 @@ $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]; -$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]; -$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]; -$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]; -$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[1]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]; -$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; -$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]; -$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'nested_in_sc'}{'contents'}[0]; $result_trees{'nested_in_sc'}{'contents'}[0]{'parent'} = $result_trees{'nested_in_sc'}; @@ -291,6 +315,9 @@ in verb $result_errors{'nested_in_sc'} = []; +$result_floats{'nested_in_sc'} = {}; + + $result_converted{'docbook'}->{'nested_in_sc'} = '<para>AAA Ñ Å &tex; Å~ <footnote><para>In footnote</para></footnote>, <abbrev>ABR</abbrev> (EXPL), <literal>IN VERB</literal> @@ -312,7 +339,7 @@ $result_converted{'html_text'}->{'nested_in_sc'} = '<p><small><small>AAA Ñ <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> <p>In footnote</p> </div> '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/no_brace.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/no_brace.pl index 477b79cd7c..a5a869bc53 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/no_brace.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/no_brace.pl @@ -26,7 +26,11 @@ $result_trees{'no_brace'} = { { 'cmdname' => 'code', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -36,7 +40,11 @@ $result_trees{'no_brace'} = { { 'cmdname' => 'footnote', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -52,10 +60,8 @@ $result_trees{'no_brace'} = { }; $result_trees{'no_brace'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'no_brace'}{'contents'}[0]; $result_trees{'no_brace'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'no_brace'}{'contents'}[0]; -$result_trees{'no_brace'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'no_brace'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'no_brace'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'no_brace'}{'contents'}[0]; $result_trees{'no_brace'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'no_brace'}{'contents'}[0]; -$result_trees{'no_brace'}{'contents'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'no_brace'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'no_brace'}{'contents'}[0]{'contents'}[4]{'parent'} = $result_trees{'no_brace'}{'contents'}[0]; $result_trees{'no_brace'}{'contents'}[0]{'contents'}[5]{'parent'} = $result_trees{'no_brace'}{'contents'}[0]; $result_trees{'no_brace'}{'contents'}[0]{'parent'} = $result_trees{'no_brace'}; @@ -96,6 +102,9 @@ $result_errors{'no_brace'} = [ ]; +$result_floats{'no_brace'} = {}; + + $result_converted{'html_text'}->{'no_brace'} = '<p>TeXand code and footnote </p>'; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/no_brace_space_end_line.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/no_brace_space_end_line.pl index 87004a9e05..b41a211e10 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/no_brace_space_end_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/no_brace_space_end_line.pl @@ -129,4 +129,7 @@ $result_errors{'no_brace_space_end_line'} = [ ]; +$result_floats{'no_brace_space_end_line'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/recursive_acronym.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/recursive_acronym.pl index a2713b1d98..d92c9b33fc 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/recursive_acronym.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/recursive_acronym.pl @@ -62,7 +62,11 @@ $result_trees{'recursive_acronym'} = { ], 'cmdname' => 'acronym', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -84,7 +88,6 @@ $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'con $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]; $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'} = $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]; $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]; -$result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'recursive_acronym'}{'contents'}[0]; $result_trees{'recursive_acronym'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'recursive_acronym'}{'contents'}[0]; $result_trees{'recursive_acronym'}{'contents'}[0]{'parent'} = $result_trees{'recursive_acronym'}; @@ -99,6 +102,9 @@ $result_texts{'recursive_acronym'} = 'GNU (GNU\'s Not Unix) $result_errors{'recursive_acronym'} = []; +$result_floats{'recursive_acronym'} = {}; + + $result_converted{'plaintext'}->{'recursive_acronym'} = 'GNU (GNU\'s Not Unix) '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/ref_empty_node.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/ref_empty_node.pl index 0fd6a3840b..62a8807bb5 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/ref_empty_node.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/ref_empty_node.pl @@ -97,7 +97,11 @@ $result_trees{'ref_empty_node'} = { ], 'cmdname' => 'ref', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -129,7 +133,11 @@ $result_trees{'ref_empty_node'} = { ], 'cmdname' => 'inforef', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -235,14 +243,12 @@ $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[4]; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'args'}[4]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]; -$result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]{'args'}[2]; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]; -$result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]; $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'ref_empty_node'}{'contents'}[1]{'contents'}[6]; @@ -269,7 +275,20 @@ $result_texts{'ref_empty_node'} = ' . '; -$result_errors{'ref_empty_node'} = []; +$result_errors{'ref_empty_node'} = [ + { + 'error_line' => ':2: warning: @inforef is obsolete. +', + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '', + 'text' => '@inforef is obsolete.', + 'type' => 'warning' + } +]; + + +$result_floats{'ref_empty_node'} = {}; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/ref_in_style_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/ref_in_style_command.pl index 5e73a2fab9..ddc8a21a4e 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/ref_in_style_command.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/ref_in_style_command.pl @@ -64,7 +64,11 @@ $result_trees{'ref_in_style_command'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -87,7 +91,6 @@ $result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{' $result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]; $result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]; -$result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'ref_in_style_command'}{'contents'}[0]; $result_trees{'ref_in_style_command'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'ref_in_style_command'}{'contents'}[0]; $result_trees{'ref_in_style_command'}{'contents'}[0]{'parent'} = $result_trees{'ref_in_style_command'}; @@ -100,11 +103,14 @@ $result_texts{'ref_in_style_command'} = '(manula)other node.'; $result_errors{'ref_in_style_command'} = []; +$result_floats{'ref_in_style_command'} = {}; + + $result_converted{'plaintext'}->{'ref_in_style_command'} = '\'*note (manula)other node::\'. '; -$result_converted{'html_text'}->{'ref_in_style_command'} = '<p>‘<samp><a href="manula.html#other-node">(manula)other node</a></samp>’.</p>'; +$result_converted{'html_text'}->{'ref_in_style_command'} = '<p>‘<samp><a data-manual="manula" href="manula.html#other-node">(manula)other node</a></samp>’.</p>'; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/simple.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/simple.pl index a2cedbe188..9f429abb9c 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/simple.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/simple.pl @@ -56,6 +56,9 @@ $result_texts{'simple'} = 'in b.'; $result_errors{'simple'} = []; +$result_floats{'simple'} = {}; + + $result_converted{'plaintext'}->{'simple'} = 'in b. '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_command_in_image.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_command_in_image.pl index 99c9674663..af2fda0e5f 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_command_in_image.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_command_in_image.pl @@ -94,7 +94,11 @@ $result_trees{'space_command_in_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -114,7 +118,6 @@ $result_trees{'space_command_in_image'}{'contents'}[2]{'args'}[1]{'parent'} = $r $result_trees{'space_command_in_image'}{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'space_command_in_image'}{'contents'}[2]; $result_trees{'space_command_in_image'}{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'space_command_in_image'}{'contents'}[2]{'args'}[3]; $result_trees{'space_command_in_image'}{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'space_command_in_image'}{'contents'}[2]; -$result_trees{'space_command_in_image'}{'contents'}[2]{'line_nr'} = $result_trees{'space_command_in_image'}{'contents'}[0]{'line_nr'}; $result_trees{'space_command_in_image'}{'contents'}[2]{'parent'} = $result_trees{'space_command_in_image'}; $result_texis{'space_command_in_image'} = '@image{f--ile,,,@ } @image{f--ile,,,@:}'; @@ -125,8 +128,11 @@ $result_texts{'space_command_in_image'} = 'f--ile f--ile'; $result_errors{'space_command_in_image'} = []; +$result_floats{'space_command_in_image'} = {}; + + -$result_converted{'plaintext'}->{'space_command_in_image'} = 'Image description""\\.Image description""\\.'; +$result_converted{'plaintext'}->{'space_command_in_image'} = 'Image description""\\. Image description""\\.'; $result_converted{'html_text'}->{'space_command_in_image'} = '<img src="f--ile.png" alt=" "> <img src="f--ile.png" alt="f--ile">'; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_anchor.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_anchor.pl index 460c16db46..c58a609d81 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_anchor.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_anchor.pl @@ -70,6 +70,9 @@ $result_texts{'space_in_anchor'} = '. $result_errors{'space_in_anchor'} = []; +$result_floats{'space_in_anchor'} = {}; + + $result_converted{'plaintext'}->{'space_in_anchor'} = '. '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl index 35f9474501..47f91ac70c 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl @@ -66,6 +66,9 @@ $result_texts{'space_in_footnote'} = 'text'; $result_errors{'space_in_footnote'} = []; +$result_floats{'space_in_footnote'} = {}; + + $result_converted{'plaintext'}->{'space_in_footnote'} = 'text(1) @@ -80,7 +83,7 @@ $result_converted{'html_text'}->{'space_in_footnote'} = '<p>text<a id="DOCF1" hr <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> <p>in footnote.</p> </div> '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_image.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_image.pl index e874d7ef5e..0eab5a6e22 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_image.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_image.pl @@ -63,7 +63,7 @@ $result_trees{'space_in_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'e' + 'text' => '.e' } ], 'extra' => { @@ -113,7 +113,11 @@ $result_trees{'space_in_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -141,12 +145,11 @@ $result_trees{'space_in_image'}{'contents'}[0]{'parent'} = $result_trees{'space_ $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'space_in_image'}{'contents'}[1]; $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]; $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]; -$result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'space_in_image'}{'contents'}[0]{'line_nr'}; $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'space_in_image'}{'contents'}[1]; $result_trees{'space_in_image'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'space_in_image'}{'contents'}[1]; $result_trees{'space_in_image'}{'contents'}[1]{'parent'} = $result_trees{'space_in_image'}; -$result_texis{'space_in_image'} = '@image{ a ,bb, cc,dd ,e }. @image{ f }.'; +$result_texis{'space_in_image'} = '@image{ a ,bb, cc,dd ,.e }. @image{ f }.'; $result_texts{'space_in_image'} = 'a. f.'; @@ -154,8 +157,11 @@ $result_texts{'space_in_image'} = 'a. f.'; $result_errors{'space_in_image'} = []; +$result_floats{'space_in_image'} = {}; + + -$result_converted{'plaintext'}->{'space_in_image'} = 'An image text before paragraph.. Another image text, in paragraph.. +$result_converted{'plaintext'}->{'space_in_image'} = 'An image text before paragraph.. Another image text, in paragraph.. '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl index 4b3ede9d9c..49aeef603c 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl @@ -21,7 +21,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => '@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} + 'text' => '@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} ', 'type' => 'raw' }, @@ -33,7 +33,7 @@ $result_trees{'test_image'} = { }, { 'parent' => {}, - 'text' => 'In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}.', + 'text' => 'In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}.', 'type' => 'raw' }, { @@ -181,7 +181,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'ext' + 'text' => '.ext' }, { 'cmdname' => '@', @@ -238,7 +238,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -251,7 +255,11 @@ $result_trees{'test_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -404,7 +412,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => 'dotless', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -414,7 +426,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => '^', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -440,7 +456,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => 'b', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -478,7 +498,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -493,7 +517,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'ext' + 'text' => '.ext' }, { 'cmdname' => '@', @@ -550,7 +574,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -563,7 +591,11 @@ $result_trees{'test_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -747,7 +779,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'ext' + 'text' => '.ext' }, { 'cmdname' => '@', @@ -804,7 +836,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -817,7 +853,11 @@ $result_trees{'test_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -966,7 +1006,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => 'dotless', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -976,7 +1020,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => '^', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -1002,7 +1050,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => 'b', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -1040,7 +1092,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -1055,7 +1111,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'ext' + 'text' => '.ext' }, { 'cmdname' => '@', @@ -1112,7 +1168,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -1125,7 +1185,11 @@ $result_trees{'test_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -1287,7 +1351,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'ext' + 'text' => '.ext' }, { 'cmdname' => '@', @@ -1344,7 +1408,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -1357,7 +1425,11 @@ $result_trees{'test_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -1504,7 +1576,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => 'dotless', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -1514,7 +1590,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => '^', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -1540,7 +1620,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => 'b', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -1578,7 +1662,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -1593,7 +1681,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'ext' + 'text' => '.ext' }, { 'cmdname' => '@', @@ -1650,7 +1738,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -1663,7 +1755,11 @@ $result_trees{'test_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -1848,7 +1944,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'ext' + 'text' => '.ext' }, { 'cmdname' => '@', @@ -1905,7 +2001,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -1918,7 +2018,11 @@ $result_trees{'test_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -2067,7 +2171,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => 'dotless', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -2077,7 +2185,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => '^', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -2103,7 +2215,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => 'b', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -2141,7 +2257,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -2156,7 +2276,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'ext' + 'text' => '.ext' }, { 'cmdname' => '@', @@ -2213,7 +2333,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -2226,7 +2350,11 @@ $result_trees{'test_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 24, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -2344,7 +2472,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'ext' + 'text' => '.ext' }, { 'cmdname' => '@', @@ -2401,7 +2529,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 26, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -2414,7 +2546,11 @@ $result_trees{'test_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 26, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -2563,7 +2699,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => 'dotless', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 26, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -2573,7 +2713,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => '^', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 26, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -2599,7 +2743,11 @@ $result_trees{'test_image'} = { ], 'cmdname' => 'b', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 26, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -2637,7 +2785,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 26, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -2652,7 +2804,7 @@ $result_trees{'test_image'} = { 'contents' => [ { 'parent' => {}, - 'text' => 'ext' + 'text' => '.ext' }, { 'cmdname' => '@', @@ -2709,7 +2861,11 @@ $result_trees{'test_image'} = { 'extra' => { 'delimiter' => ':' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 26, + 'macro' => 'files-char' + }, 'parent' => {} } ], @@ -2722,7 +2878,11 @@ $result_trees{'test_image'} = { 'extra' => { 'input_perl_encoding' => 'utf-8' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 26, + 'macro' => 'files-char' + }, 'parent' => {} }, { @@ -2795,7 +2955,9 @@ $result_trees{'test_image'} = { 'normalized' => 'Image-with-commands', 'spaces_before_argument' => ' ', 'type' => { - 'content' => [], + 'content' => [ + {} + ], 'normalized' => 'Image' } }, @@ -2834,7 +2996,9 @@ $result_trees{'test_image'} = { 'extra' => { 'spaces_before_argument' => ' ', 'type' => { - 'content' => [], + 'content' => [ + {} + ], 'normalized' => 'Image' } }, @@ -2858,7 +3022,9 @@ $result_trees{'test_image'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -2915,10 +3081,8 @@ $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'conten $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[9]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]; -$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]{'line_nr'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]; @@ -2945,17 +3109,14 @@ $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'conten $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]; @@ -2963,7 +3124,6 @@ $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'conten $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[5]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]; -$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'line_nr'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]; @@ -2978,10 +3138,8 @@ $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'conten $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[9]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]; -$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'line_nr'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]; $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]; @@ -3024,10 +3182,8 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'} $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[9]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[10]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]; @@ -3053,17 +3209,14 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'} $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]; @@ -3071,7 +3224,6 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'} $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[5]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[6]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[6]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[6]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]; @@ -3086,10 +3238,8 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'} $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'contents'}[9]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'contents'}[10]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'contents'}[10]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'contents'}[10]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]; @@ -3130,10 +3280,8 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'conten $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[4]{'contents'}[9]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[4]{'contents'}[10]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[4]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[4]{'contents'}[10]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[4]{'contents'}[10]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[4]{'contents'}[10]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]; @@ -3159,17 +3307,14 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'conten $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]; @@ -3177,7 +3322,6 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'conten $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[5]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[6]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[6]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[6]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[6]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]; @@ -3192,10 +3336,8 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'conten $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[9]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[10]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[10]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[10]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[10]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]; @@ -3238,10 +3380,8 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args' $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[4]{'contents'}[9]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[4]{'contents'}[10]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[4]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[4]{'contents'}[10]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[4]{'contents'}[10]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[4]{'contents'}[10]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]; @@ -3267,17 +3407,14 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'conte $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]; @@ -3285,7 +3422,6 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'conte $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[5]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]; @@ -3300,10 +3436,8 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'conte $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[9]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]; @@ -3337,10 +3471,8 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args' $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[4]{'contents'}[9]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[4]{'contents'}[10]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[4]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[4]{'contents'}[10]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[4]{'contents'}[10]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[4]{'contents'}[10]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]; @@ -3366,17 +3498,14 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args' $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]; @@ -3384,7 +3513,6 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args' $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[5]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[6]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]; @@ -3399,10 +3527,8 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args' $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[9]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'contents'}[10]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[10]{'line_nr'}; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]{'args'}[0]; @@ -3416,54 +3542,54 @@ $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[7]{'paren $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'extra'}{'caption'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[7]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'extra'}{'node_content'}[0] = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'extra'}{'type'}{'content'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}; +$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'extra'}{'type'}{'content'}[0] = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'parent'} = $result_trees{'test_image'}{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'test_image'}{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[13]{'args'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'parent'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[13]; -$result_trees{'test_image'}{'contents'}[1]{'contents'}[13]{'extra'}{'type'}{'content'} = $result_trees{'test_image'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}; +$result_trees{'test_image'}{'contents'}[1]{'contents'}[13]{'extra'}{'type'}{'content'}[0] = $result_trees{'test_image'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[0]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'test_image'}{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'contents'}[14]{'parent'} = $result_trees{'test_image'}{'contents'}[1]; $result_trees{'test_image'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'test_image'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'test_image'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'test_image'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'test_image'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'test_image'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'test_image'}{'contents'}[1]{'parent'} = $result_trees{'test_image'}; $result_texis{'test_image'} = '@macro files-char -@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} +@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} -In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}. +In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}. @end macro @copying Text in copying. -@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} +@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} -In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}. +In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}. @end copying @node Top -@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} +@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} -In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}. +In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}. Insertcopying @insertcopying @example -@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} +@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} -In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}. +In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}. @end example @float Image, Image with commands -@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} +@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} -In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}. +In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}. -@caption{@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} +@caption{@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}} -In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}.} +In text @image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,1in, 1cm, alt @b{@^{@dotless{i}}--le@/.@.} a@*<"%@@@verb{: < & @ % " :} ,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}.} @end float @listoffloats Image @@ -3781,27 +3907,29 @@ $result_floats{'test_image'}{'Image'}[0]{'extra'}{'caption'}{'extra'}{'float'} = $result_converted{'html'}->{'test_image'} = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> +<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ --> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <!-- Text in copying. f@i-le.. a@<"%@ < & @ % " In text f@i-le.. a@<"%@ < & @ % " . --> -<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ --> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Untitled Document</title> <meta name="description" content="Untitled Document"> <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -3810,6 +3938,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -3835,10 +3964,10 @@ ul.no-bullet {list-style: none} <"%@ < & @ % " ">. </p> <div class="example"> -<pre class="example">[ f@i--le.. a@<"%@ < & @ % " ] +<pre class="example"><img src="f@i--le.. a@<"%@ < & @ % " .ext@i--le.. a@<"%@ < & @ % " " alt="f@i--le.. a@<"%@ < & @ % " "> -In text [ alt <b>î–le..</b> a -<"%@<tt> < & @ % " </tt> ]. +In text <img src="f@i--le.. a@<"%@ < & @ % " .ext@i--le.. a@<"%@ < & @ % " " alt="alt î–le.. a +<"%@ < & @ % " ">. </pre></div> <div class="float"><span id="Image-with-commands"></span> @@ -3862,7 +3991,6 @@ In text [ alt <b>î–le..</b> a <hr> - </body> </html> '; @@ -3969,11 +4097,12 @@ $result_converted_errors{'html'}->{'test_image'} = [ $result_converted{'plaintext'}->{'test_image'} = '[f@i--le.. a@<"%@ < & @ % " ] + In text [alt î-le.. a <"%@ < & @ % " ]. Insertcopying - Text in copying. [f@i--le.. a@<"%@ < & @ % " ] + Text in copying. [f@i--le.. a@<"%@ < & @ % " ] In text [alt î-le.. a <"%@ < & @ % " ]. @@ -3984,10 +4113,13 @@ In text [alt î-le.. a <"%@ < & @ % " ]. [f@i--le.. a@<"%@ < & @ % " ] + In text [alt î-le.. a <"%@ < & @ % " ]. + Image 1: [f@i--le.. a@<"%@ < & @ % " ] + In text [alt î-le.. a <"%@ < & @ % " ]. @@ -4073,10 +4205,10 @@ $result_converted{'html_text'}->{'test_image'} = ' <"%@ < & @ % " ">. </p> <div class="example"> -<pre class="example">[ f@i--le.. a@<"%@ < & @ % " ] +<pre class="example"><img src="f@i--le.. a@<"%@ < & @ % " .ext@i--le.. a@<"%@ < & @ % " " alt="f@i--le.. a@<"%@ < & @ % " "> -In text [ alt <b>î–le..</b> a -<"%@<tt> < & @ % " </tt> ]. +In text <img src="f@i--le.. a@<"%@ < & @ % " .ext@i--le.. a@<"%@ < & @ % " " alt="alt î–le.. a +<"%@ < & @ % " ">. </pre></div> <div class="float"><span id="Image-with-commands"></span> @@ -4097,8 +4229,7 @@ In text [ alt <b>î–le..</b> a <"%@ < & @ % " ">.</p></dd> </dl> -<hr> -'; +<hr>'; $result_converted_errors{'html_text'}->{'test_image'} = [ { diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_w.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_w.pl index 15b07efa0e..b32805c091 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_w.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_w.pl @@ -649,7 +649,11 @@ $result_trees{'test_w'} = { ], 'cmdname' => 'dots', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 34, + 'macro' => '' + }, 'parent' => {} }, { @@ -666,7 +670,11 @@ $result_trees{'test_w'} = { ], 'cmdname' => 'w', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 34, + 'macro' => '' + }, 'parent' => {} }, { @@ -680,7 +688,11 @@ $result_trees{'test_w'} = { ], 'cmdname' => 't', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 34, + 'macro' => '' + }, 'parent' => {} } ], @@ -690,7 +702,11 @@ $result_trees{'test_w'} = { ], 'cmdname' => 'w', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 34, + 'macro' => '' + }, 'parent' => {} }, { @@ -816,18 +832,14 @@ $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0] $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]; -$result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]; -$result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]; -$result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'line_nr'} = $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'test_w'}{'contents'}[31]{'contents'}[1]{'parent'} = $result_trees{'test_w'}{'contents'}[31]; $result_trees{'test_w'}{'contents'}[31]{'contents'}[2]{'parent'} = $result_trees{'test_w'}{'contents'}[31]; $result_trees{'test_w'}{'contents'}[31]{'contents'}[3]{'parent'} = $result_trees{'test_w'}{'contents'}[31]; @@ -914,6 +926,9 @@ two single quotes to left- and right-hand doubled. $result_errors{'test_w'} = []; +$result_floats{'test_w'} = {}; + + $result_converted{'plaintext'}->{'test_w'} = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb bbbbb bbb b b b b b b b b b bb . ccc dddd. diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/too_much_args.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/too_much_args.pl index dcce9f78eb..824c7542fa 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/too_much_args.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/too_much_args.pl @@ -66,6 +66,9 @@ $result_texts{'too_much_args'} = 'AZE (A truc Z b, E eep)'; $result_errors{'too_much_args'} = []; +$result_floats{'too_much_args'} = {}; + + $result_converted{'plaintext'}->{'too_much_args'} = 'AZE (A truc Z b, E eep) '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl index 8e12c0dfa4..c3c831b673 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl @@ -37,7 +37,9 @@ $result_trees{'two_footnotes_in_nodes'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -361,7 +363,9 @@ $result_trees{'two_footnotes_in_nodes'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'chapter' } ], @@ -552,7 +556,7 @@ $result_trees{'two_footnotes_in_nodes'}{'contents'}[0]{'parent'} = $result_trees $result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'args'}[0]; $result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[1]; $result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'parent'} = $result_trees{'two_footnotes_in_nodes'}; $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'args'}[0]; $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]; @@ -601,7 +605,7 @@ $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'parent'} = $result_trees $result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'args'}[0]; $result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[3]; $result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'extra'}{'node_content'}; +$result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0]; $result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'parent'} = $result_trees{'two_footnotes_in_nodes'}; $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'args'}[0]; $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes'}{'contents'}[4]; @@ -796,6 +800,9 @@ $result_menus{'two_footnotes_in_nodes'}{'menu_child'}{'menu_up'} = $result_menus $result_errors{'two_footnotes_in_nodes'} = []; +$result_floats{'two_footnotes_in_nodes'} = {}; + + $result_converted{'html'}->{'two_footnotes_in_nodes'} = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> @@ -808,14 +815,16 @@ $result_converted{'html'}->{'two_footnotes_in_nodes'} = '<!DOCTYPE html PUBLIC " <meta name="keywords" content="2 footnotes in 2 nodes"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -824,6 +833,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -832,7 +842,8 @@ ul.no-bullet {list-style: none} </head> <body lang="en"> -<span id="Top"></span><div class="header"> +<div class="top" id="Top"> +<div class="header"> <p> Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> </p> </div> @@ -842,15 +853,15 @@ Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> </p> </p> <p>B<a id="DOCF2" href="#FOOT2"><sup>2</sup></a> </p> -<table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#chapter" accesskey="1">chapter</a></td><td> </td><td align="left" valign="top"> -</td></tr> -</table> +<ul class="section-toc"> +<li><a href="#chapter" accesskey="1">chapter</a></li> +</ul> <hr> -<span id="chapter"></span><div class="header"> +<div class="chapter" id="chapter"> +<div class="header"> <p> -Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p> +Previous: <a href="#Top" accesskey="p" rel="prev">2 footnotes in 2 nodes</a>, Up: <a href="#Top" accesskey="u" rel="up">2 footnotes in 2 nodes</a> </p> </div> <span id="chapter-1"></span><h2 class="chapter">1 chapter</h2> @@ -858,28 +869,29 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac </p> <p>D<a id="DOCF4" href="#FOOT4"><sup>4</sup></a> </p> +</div> +</div> <div class="footnote"> <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> <p>Footnote Top/1 </p> <p>para2</p> -<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3> +<h5><a id="FOOT2" href="#DOCF2">(2)</a></h5> <p>Footnote Top/2 </p> <p>para2</p> -<h5><a id="FOOT3" href="#DOCF3">(3)</a></h3> +<h5><a id="FOOT3" href="#DOCF3">(3)</a></h5> <p>Footnote chapter/1 </p> <p>para2</p> -<h5><a id="FOOT4" href="#DOCF4">(4)</a></h3> +<h5><a id="FOOT4" href="#DOCF4">(4)</a></h5> <p>Footnote chapter/2 </p> <p>para2</p> </div> -<hr> @@ -990,7 +1002,8 @@ C(1) '; -$result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<span id="Top"></span><div class="header"> +$result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<div class="top" id="Top"> +<div class="header"> <p> </p> </div> @@ -1000,13 +1013,13 @@ $result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<span id="Top"></s </p> <p>B<a id="DOCF2" href="#FOOT2"><sup>2</sup></a> </p> -<table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#chapter" accesskey="1">chapter</a></td><td> </td><td align="left" valign="top"> -</td></tr> -</table> +<ul class="section-toc"> +<li><a href="#chapter" accesskey="1">chapter</a></li> +</ul> <hr> -<span id="chapter"></span><div class="header"> +<div class="chapter" id="chapter"> +<div class="header"> <p> </p> </div> @@ -1016,28 +1029,29 @@ $result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<span id="Top"></s </p> <p>D<a id="DOCF4" href="#FOOT4"><sup>4</sup></a> </p> +</div> +</div> <div class="footnote"> <hr> <h4 class="footnotes-heading">Footnotes</h4> -<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3> +<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5> <p>Footnote Top/1 </p> <p>para2</p> -<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3> +<h5><a id="FOOT2" href="#DOCF2">(2)</a></h5> <p>Footnote Top/2 </p> <p>para2</p> -<h5><a id="FOOT3" href="#DOCF3">(3)</a></h3> +<h5><a id="FOOT3" href="#DOCF3">(3)</a></h5> <p>Footnote chapter/1 </p> <p>para2</p> -<h5><a id="FOOT4" href="#DOCF4">(4)</a></h3> +<h5><a id="FOOT4" href="#DOCF4">(4)</a></h5> <p>Footnote chapter/2 </p> <p>para2</p> </div> -<hr> '; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl index b97547affc..d8c3bec75f 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl @@ -69,7 +69,9 @@ $result_trees{'two_footnotes_in_nodes_separate'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -393,7 +395,9 @@ $result_trees{'two_footnotes_in_nodes_separate'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'chapter' } ], @@ -587,7 +591,7 @@ $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[0]{'parent'} = $res $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'args'}[0]; $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]; $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}; $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'args'}[0]; $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]; @@ -636,7 +640,7 @@ $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'parent'} = $res $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'args'}[0]; $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]; $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'extra'}{'node_content'}; +$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0]; $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}; $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'args'}[0]; $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[4]; @@ -832,6 +836,9 @@ $result_menus{'two_footnotes_in_nodes_separate'}{'menu_child'}{'menu_up'} = $res $result_errors{'two_footnotes_in_nodes_separate'} = []; +$result_floats{'two_footnotes_in_nodes_separate'} = {}; + + $result_converted{'html'}->{'two_footnotes_in_nodes_separate'} = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> @@ -844,14 +851,16 @@ $result_converted{'html'}->{'two_footnotes_in_nodes_separate'} = '<!DOCTYPE html <meta name="keywords" content="2 footnotes in 2 nodes"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -860,6 +869,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -868,7 +878,8 @@ ul.no-bullet {list-style: none} </head> <body lang="en"> -<span id="Top"></span><div class="header"> +<div class="top" id="Top"> +<div class="header"> <p> Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> </p> </div> @@ -878,15 +889,15 @@ Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> </p> </p> <p>B<a id="DOCF2" href="#FOOT2"><sup>2</sup></a> </p> -<table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#chapter" accesskey="1">chapter</a></td><td> </td><td align="left" valign="top"> -</td></tr> -</table> +<ul class="section-toc"> +<li><a href="#chapter" accesskey="1">chapter</a></li> +</ul> <hr> -<span id="chapter"></span><div class="header"> +<div class="chapter" id="chapter"> +<div class="header"> <p> -Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p> +Previous: <a href="#Top" accesskey="p" rel="prev">2 footnotes in 2 nodes</a>, Up: <a href="#Top" accesskey="u" rel="up">2 footnotes in 2 nodes</a> </p> </div> <span id="chapter-1"></span><h2 class="chapter">1 chapter</h2> @@ -894,7 +905,8 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac </p> <p>D<a id="DOCF4" href="#FOOT4"><sup>4</sup></a> </p> -<hr> +</div> +</div> @@ -1005,7 +1017,8 @@ C(1) (*note chapter-Footnote-1::) '; -$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<span id="Top"></span><div class="header"> +$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<div class="top" id="Top"> +<div class="header"> <p> </p> </div> @@ -1015,13 +1028,13 @@ $result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<span id= </p> <p>B<a id="DOCF2" href="#FOOT2"><sup>2</sup></a> </p> -<table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#chapter" accesskey="1">chapter</a></td><td> </td><td align="left" valign="top"> -</td></tr> -</table> +<ul class="section-toc"> +<li><a href="#chapter" accesskey="1">chapter</a></li> +</ul> <hr> -<span id="chapter"></span><div class="header"> +<div class="chapter" id="chapter"> +<div class="header"> <p> </p> </div> @@ -1031,7 +1044,8 @@ $result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<span id= </p> <p>D<a id="DOCF4" href="#FOOT4"><sup>4</sup></a> </p> -<hr> +</div> +</div> '; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/unknown_command_with_braces.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/unknown_command_with_braces.pl index 91e7bcdc68..bb6bd55ff8 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/unknown_command_with_braces.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/unknown_command_with_braces.pl @@ -236,4 +236,7 @@ $result_errors{'unknown_command_with_braces'} = [ ]; +$result_floats{'unknown_command_with_braces'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/unmatched_brace.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/unmatched_brace.pl index d9b5f2a6de..1efe87e4d2 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/unmatched_brace.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/unmatched_brace.pl @@ -58,7 +58,11 @@ $result_trees{'unmatched_brace'} = { ], 'cmdname' => 'samp', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -80,7 +84,6 @@ $result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'conte $result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[2]{'args'}[0]; $result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[2]{'args'}[0]; $result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[2]; -$result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'unmatched_brace'}{'contents'}[0]; $result_trees{'unmatched_brace'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'unmatched_brace'}{'contents'}[0]; $result_trees{'unmatched_brace'}{'contents'}[0]{'parent'} = $result_trees{'unmatched_brace'}; @@ -103,4 +106,7 @@ $result_errors{'unmatched_brace'} = [ ]; +$result_floats{'unmatched_brace'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl index 6c8679c61e..bef3a23b0f 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl @@ -109,7 +109,11 @@ $result_trees{'uref_in_ref'} = { ], 'cmdname' => 'uref', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -150,7 +154,11 @@ $result_trees{'uref_in_ref'} = { ], 'cmdname' => 'uref', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -191,7 +199,11 @@ $result_trees{'uref_in_ref'} = { ], 'cmdname' => 'uref', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} } ], @@ -214,7 +226,11 @@ $result_trees{'uref_in_ref'} = { ] } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, 'parent' => {} }, { @@ -246,7 +262,6 @@ $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents' $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'args'}[1]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]; -$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]; @@ -254,7 +269,6 @@ $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents' $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]; -$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]; @@ -262,12 +276,10 @@ $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents' $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[1]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[1]{'args'}[1]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[1]; -$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[1]{'line_nr'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'contents'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[4]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'manual_content'}[0] = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]; -$result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]; $result_trees{'uref_in_ref'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'uref_in_ref'}{'contents'}[0]; $result_trees{'uref_in_ref'}{'contents'}[0]{'parent'} = $result_trees{'uref_in_ref'}; @@ -282,6 +294,9 @@ $result_texts{'uref_in_ref'} = '(file)node $result_errors{'uref_in_ref'} = []; +$result_floats{'uref_in_ref'} = {}; + + $result_converted{'plaintext'}->{'uref_in_ref'} = '*note cross ref with uref uref1 (href://http/myhost.com/index.html): (info file with uref3 uref3 @@ -302,7 +317,7 @@ $result_converted_errors{'plaintext'}->{'uref_in_ref'} = [ -$result_converted{'html_text'}->{'uref_in_ref'} = '<p><a href="index3.html (uref3).html#node">title with uref2 <a href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite> +$result_converted{'html_text'}->{'uref_in_ref'} = '<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html (uref3)" href="index3.html (uref3).html#node">title with uref2 <a href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite> </p>'; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_url.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_url.pl index 865a3aee24..bfd9f88a1b 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_url.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_url.pl @@ -449,6 +449,9 @@ $result_texts{'uref_url'} = '--a (-b) $result_errors{'uref_url'} = []; +$result_floats{'uref_url'} = {}; + + $result_converted{'plaintext'}->{'uref_url'} = '-b (--a) <--c> -d -g -i -k -l -n (--m) -q '; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl index f308a98b34..54f171d480 100644 --- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl @@ -116,7 +116,11 @@ $result_trees{'verb_in_xref'} = { 'normalized' => 'Top' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} }, { @@ -135,7 +139,9 @@ $result_trees{'verb_in_xref'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -167,12 +173,11 @@ $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]; $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'label'} = $result_trees{'verb_in_xref'}{'contents'}[1]; $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]; -$result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'line_nr'} = $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]; $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]; $result_trees{'verb_in_xref'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'verb_in_xref'}{'contents'}[1]; $result_trees{'verb_in_xref'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'verb_in_xref'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'verb_in_xref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'verb_in_xref'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'verb_in_xref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'verb_in_xref'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'verb_in_xref'}{'contents'}[1]{'parent'} = $result_trees{'verb_in_xref'}; $result_texis{'verb_in_xref'} = '@node Top @@ -219,6 +224,9 @@ $result_errors{'verb_in_xref'} = [ ]; +$result_floats{'verb_in_xref'} = {}; + + $result_converted{'plaintext'}->{'verb_in_xref'} = '*Note with verb @@ -233,7 +241,6 @@ $result_converted{'html_text'}->{'verb_in_xref'} = '<span id="Top"></span><h1 cl verb ggg </tt></a>. -</p><hr> -'; +</p><hr>'; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/w_end_sentence.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/w_end_sentence.pl new file mode 100644 index 0000000000..82b136049e --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/w_end_sentence.pl @@ -0,0 +1,69 @@ +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{'w_end_sentence'} = { + 'contents' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'a. ' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'b' + } + ], + 'parent' => {}, + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'w', + 'contents' => [], + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'parent' => {}, + 'type' => 'paragraph' + } + ], + 'type' => 'text_root' +}; +$result_trees{'w_end_sentence'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'w_end_sentence'}{'contents'}[0]; +$result_trees{'w_end_sentence'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'w_end_sentence'}{'contents'}[0]{'contents'}[1]{'args'}[0]; +$result_trees{'w_end_sentence'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'w_end_sentence'}{'contents'}[0]{'contents'}[1]; +$result_trees{'w_end_sentence'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'w_end_sentence'}{'contents'}[0]; +$result_trees{'w_end_sentence'}{'contents'}[0]{'parent'} = $result_trees{'w_end_sentence'}; + +$result_texis{'w_end_sentence'} = 'a. @w{b}'; + + +$result_texts{'w_end_sentence'} = 'a. b'; + +$result_errors{'w_end_sentence'} = []; + + +$result_floats{'w_end_sentence'} = {}; + + + +$result_converted{'plaintext'}->{'w_end_sentence'} = 'a. b +'; + + +$result_converted{'html_text'}->{'w_end_sentence'} = '<p>a. b<!-- /@w --></p>'; + +1; |