diff options
Diffstat (limited to 'macros/texinfo/texinfo/tp/t/results/preformatted')
15 files changed, 575 insertions, 59 deletions
diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/caption_in_example.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/caption_in_example.pl index e67acdb291..ed54dad228 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/caption_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/caption_in_example.pl @@ -191,7 +191,9 @@ $result_trees{'caption_in_example'} = { 'end_command' => {}, 'spaces_before_argument' => ' ', 'type' => { - 'content' => [], + 'content' => [ + {} + ], 'normalized' => 'float' } }, @@ -232,7 +234,7 @@ $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'pa $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'caption_in_example'}{'contents'}[0]; $result_trees{'caption_in_example'}{'contents'}[0]{'extra'}{'caption'} = $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]; $result_trees{'caption_in_example'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[2]; -$result_trees{'caption_in_example'}{'contents'}[0]{'extra'}{'type'}{'content'} = $result_trees{'caption_in_example'}{'contents'}[0]{'args'}[0]{'contents'}; +$result_trees{'caption_in_example'}{'contents'}[0]{'extra'}{'type'}{'content'}[0] = $result_trees{'caption_in_example'}{'contents'}[0]{'args'}[0]{'contents'}[0]; $result_trees{'caption_in_example'}{'contents'}[0]{'parent'} = $result_trees{'caption_in_example'}; $result_texis{'caption_in_example'} = '@float float diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/comment_example_and_blank_lines.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/comment_example_and_blank_lines.pl index 1ccf0e1554..7c97b1d550 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/comment_example_and_blank_lines.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/comment_example_and_blank_lines.pl @@ -492,6 +492,9 @@ Para. $result_errors{'comment_example_and_blank_lines'} = []; +$result_floats{'comment_example_and_blank_lines'} = {}; + + $result_converted{'plaintext'}->{'comment_example_and_blank_lines'} = 'Para. diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/comments_in_example.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/comments_in_example.pl index b9da945ccb..4064e3cacd 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/comments_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/comments_in_example.pl @@ -410,6 +410,9 @@ second line $result_errors{'comments_in_example'} = []; +$result_floats{'comments_in_example'} = {}; + + $result_converted{'plaintext'}->{'comments_in_example'} = 'Example with comments 2 lines line second line diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/def_in_example.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/def_in_example.pl index c13a169b47..afceda646e 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/def_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/def_in_example.pl @@ -166,7 +166,11 @@ $result_trees{'def_in_example'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, 'parent' => {} }, { @@ -236,7 +240,6 @@ $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'ar $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]; $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]; $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]; -$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'def_in_example'}{'contents'}[0]; $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]; $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[2]; @@ -269,6 +272,9 @@ $result_errors{'def_in_example'} = [ ]; +$result_floats{'def_in_example'} = {}; + + $result_converted{'plaintext'}->{'def_in_example'} = ' -- Function: name arg in defun @@ -276,8 +282,8 @@ $result_converted{'plaintext'}->{'def_in_example'} = ' -- Function: name ar $result_converted{'html_text'}->{'def_in_example'} = '<div class="example"> -<dl> -<dt id="index-name">Function: <strong>name</strong> <em>arg</em></dt> +<dl class="def"> +<dt id="index-name"><span class="category">Function: </span><span><strong>name</strong> <em>arg</em><a href=\'#index-name\' class=\'copiable-anchor\'> ¶</a></span></dt> <dd><pre class="example">in defun </pre></dd></dl> </div> diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/empty_line.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/empty_line.pl index 9c1c16df5c..ed566c46bd 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/empty_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/empty_line.pl @@ -113,6 +113,9 @@ after empty line $result_errors{'empty_line'} = []; +$result_floats{'empty_line'} = {}; + + $result_converted{'plaintext'}->{'empty_line'} = ' example diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/empty_line_style_command.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/empty_line_style_command.pl index db07d7b234..3209526d95 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/empty_line_style_command.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/empty_line_style_command.pl @@ -143,4 +143,7 @@ after empty line $result_errors{'empty_line_style_command'} = []; +$result_floats{'empty_line_style_command'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/insertcopying_in_example.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/insertcopying_in_example.pl index d2c5ffd3fa..30f6068e25 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/insertcopying_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/insertcopying_in_example.pl @@ -116,6 +116,9 @@ $result_texts{'insertcopying_in_example'} = 'text $result_errors{'insertcopying_in_example'} = []; +$result_floats{'insertcopying_in_example'} = {}; + + $result_converted{'plaintext'}->{'insertcopying_in_example'} = ' text '; diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/nested_example_and_comment.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/nested_example_and_comment.pl index b096d79581..4fbc8507da 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/nested_example_and_comment.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/nested_example_and_comment.pl @@ -652,6 +652,9 @@ First line 2 Nested example In first one '; $result_errors{'nested_example_and_comment'} = []; +$result_floats{'nested_example_and_comment'} = {}; + + $result_converted{'plaintext'}->{'nested_example_and_comment'} = ' First line 0 Nested example diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/nested_formats.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/nested_formats.pl index 901987bf2e..e2789b9395 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/nested_formats.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/nested_formats.pl @@ -342,6 +342,9 @@ in -- example/format $result_errors{'nested_formats'} = []; +$result_floats{'nested_formats'} = {}; + + $result_converted{'plaintext'}->{'nested_formats'} = ' in -- format/example diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/page_in_example.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/page_in_example.pl index 1e155b06fe..da8b2bcede 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/page_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/page_in_example.pl @@ -111,6 +111,9 @@ $result_texts{'page_in_example'} = 'text $result_errors{'page_in_example'} = []; +$result_floats{'page_in_example'} = {}; + + $result_converted{'plaintext'}->{'page_in_example'} = ' text '; diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_display.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_display.pl index fa775653bd..6d7c92a394 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_display.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_display.pl @@ -114,6 +114,9 @@ and now - yes--now and "so". $result_errors{'quote_dash_in_display'} = []; +$result_floats{'quote_dash_in_display'} = {}; + + $result_converted{'plaintext'}->{'quote_dash_in_display'} = ' and now - yes--now and "so". diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_example.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_example.pl index 9de864777b..5840665145 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_example.pl @@ -114,6 +114,9 @@ and now -- yes---now and ``so\'\'. $result_errors{'quote_dash_in_example'} = []; +$result_floats{'quote_dash_in_example'} = {}; + + $result_converted{'plaintext'}->{'quote_dash_in_example'} = ' and now -- yes---now and ``so\'\'. diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/text_on_display_command_line.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/text_on_display_command_line.pl new file mode 100644 index 0000000000..aab08c3b18 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/text_on_display_command_line.pl @@ -0,0 +1,473 @@ +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{'text_on_display_command_line'} = { + 'contents' => [ + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'text on line' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'display', + 'contents' => [ + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'display' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'display', + 'spaces_before_argument' => ' ', + 'text_arg' => 'display' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 2, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'end_command' => {}, + 'spaces_before_argument' => ' ' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, + 'parent' => {} + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'text on line followed by text' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'display', + 'contents' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'normal text +' + } + ], + 'parent' => {}, + 'type' => 'preformatted' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'display' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'display', + 'spaces_before_argument' => ' ', + 'text_arg' => 'display' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'end_command' => {}, + 'spaces_before_argument' => ' ' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, + 'parent' => {} + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'cmdname' => 'display', + 'contents' => [ + { + 'extra' => { + 'command' => {} + }, + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line_after_command' + }, + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'in display +' + } + ], + 'parent' => {}, + 'type' => 'preformatted' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'display text after end' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'display', + 'spaces_before_argument' => ' ', + 'text_arg' => 'display text after end' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 10, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'end_command' => {} + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, + 'parent' => {} + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'cmdname' => 'display', + 'contents' => [ + { + 'extra' => { + 'command' => {} + }, + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line_after_command' + }, + { + 'cmdname' => 'display', + 'contents' => [ + { + 'extra' => { + 'command' => {} + }, + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line_after_command' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'display text after end display nested in display' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'display', + 'spaces_before_argument' => ' ', + 'text_arg' => 'display text after end display nested in display' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 14, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'end_command' => {} + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 13, + 'macro' => '' + }, + 'parent' => {} + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'display' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'display', + 'spaces_before_argument' => ' ', + 'text_arg' => 'display' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 15, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'end_command' => {} + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 12, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'type' => 'text_root' +}; +$result_trees{'text_on_display_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'args'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}; +$result_trees{'text_on_display_command_line'}{'contents'}[1]{'parent'} = $result_trees{'text_on_display_command_line'}; +$result_trees{'text_on_display_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[2]{'args'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[2]; +$result_trees{'text_on_display_command_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[2]{'contents'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[2]; +$result_trees{'text_on_display_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[2]{'contents'}[1]; +$result_trees{'text_on_display_command_line'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[2]; +$result_trees{'text_on_display_command_line'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'text_on_display_command_line'}{'contents'}[2]{'contents'}[1]; +$result_trees{'text_on_display_command_line'}{'contents'}[2]{'parent'} = $result_trees{'text_on_display_command_line'}; +$result_trees{'text_on_display_command_line'}{'contents'}[3]{'parent'} = $result_trees{'text_on_display_command_line'}; +$result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'} = $result_trees{'text_on_display_command_line'}{'contents'}[4]; +$result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[4]; +$result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[1]; +$result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[4]; +$result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[2]{'args'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[2]; +$result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[4]; +$result_trees{'text_on_display_command_line'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'text_on_display_command_line'}{'contents'}[4]{'contents'}[2]; +$result_trees{'text_on_display_command_line'}{'contents'}[4]{'parent'} = $result_trees{'text_on_display_command_line'}; +$result_trees{'text_on_display_command_line'}{'contents'}[5]{'parent'} = $result_trees{'text_on_display_command_line'}; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[2]{'args'}[0]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[2]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'text_on_display_command_line'}{'contents'}[6]{'contents'}[2]; +$result_trees{'text_on_display_command_line'}{'contents'}[6]{'parent'} = $result_trees{'text_on_display_command_line'}; + +$result_texis{'text_on_display_command_line'} = '@display text on line +@end display + +@display text on line followed by text +normal text +@end display + +@display +in display +@end display text after end + +@display +@display +@end display text after end display nested in display +@end display +'; + + +$result_texts{'text_on_display_command_line'} = ' +normal text + +in display + +'; + +$result_errors{'text_on_display_command_line'} = [ + { + 'error_line' => ':10: superfluous argument to @end display: text after end +', + 'file_name' => '', + 'line_nr' => 10, + 'macro' => '', + 'text' => 'superfluous argument to @end display: text after end', + 'type' => 'error' + }, + { + 'error_line' => ':14: superfluous argument to @end display: text after end display nested in display +', + 'file_name' => '', + 'line_nr' => 14, + 'macro' => '', + 'text' => 'superfluous argument to @end display: text after end display nested in display', + 'type' => 'error' + } +]; + + +$result_floats{'text_on_display_command_line'} = {}; + + + +$result_converted{'plaintext'}->{'text_on_display_command_line'} = ' + normal text + + in display + +'; + + +$result_converted{'html_text'}->{'text_on_display_command_line'} = ' +<div class="display"> +<pre class="display">normal text +</pre></div> + +<div class="display"> +<pre class="display">in display +</pre></div> + +'; + + +$result_converted{'docbook'}->{'text_on_display_command_line'} = ' +<literallayout>normal text +</literallayout> +<literallayout>in display +</literallayout> +'; + + +$result_converted{'xml'}->{'text_on_display_command_line'} = '<display spaces=" " endspaces=" "> +</display> + +<display spaces=" " endspaces=" "> +<pre xml:space="preserve">normal text +</pre></display> + +<display endspaces=" "> +<pre xml:space="preserve">in display +</pre></display> + +<display endspaces=" "> +<display endspaces=" "> +</display> +</display> +'; + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/text_on_command_line.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/text_on_example_command_line.pl index 2759428e7b..1d8d8e5397 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/text_on_command_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/text_on_example_command_line.pl @@ -5,7 +5,7 @@ use vars qw(%result_texis %result_texts %result_trees %result_errors use utf8; -$result_trees{'text_on_command_line'} = { +$result_trees{'text_on_example_command_line'} = { 'contents' => [ { 'args' => [ @@ -331,50 +331,50 @@ $result_trees{'text_on_command_line'} = { ], 'type' => 'text_root' }; -$result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}; -$result_trees{'text_on_command_line'}{'contents'}[1]{'parent'} = $result_trees{'text_on_command_line'}; -$result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[2]; -$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[2]; -$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]; -$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[2]; -$result_trees{'text_on_command_line'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]; -$result_trees{'text_on_command_line'}{'contents'}[2]{'parent'} = $result_trees{'text_on_command_line'}; -$result_trees{'text_on_command_line'}{'contents'}[3]{'parent'} = $result_trees{'text_on_command_line'}; -$result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'} = $result_trees{'text_on_command_line'}{'contents'}[4]; -$result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[4]; -$result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[1]; -$result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[4]; -$result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[2]{'args'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[2]; -$result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[4]; -$result_trees{'text_on_command_line'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'text_on_command_line'}{'contents'}[4]{'contents'}[2]; -$result_trees{'text_on_command_line'}{'contents'}[4]{'parent'} = $result_trees{'text_on_command_line'}; -$result_trees{'text_on_command_line'}{'contents'}[5]{'parent'} = $result_trees{'text_on_command_line'}; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'text_on_command_line'}{'contents'}[6]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[6]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[6]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[2]{'args'}[0]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[2]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'text_on_command_line'}{'contents'}[6]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[2]; -$result_trees{'text_on_command_line'}{'contents'}[6]{'parent'} = $result_trees{'text_on_command_line'}; +$result_trees{'text_on_example_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'args'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}; +$result_trees{'text_on_example_command_line'}{'contents'}[1]{'parent'} = $result_trees{'text_on_example_command_line'}; +$result_trees{'text_on_example_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[2]{'args'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[2]; +$result_trees{'text_on_example_command_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[2]{'contents'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[2]; +$result_trees{'text_on_example_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[2]{'contents'}[1]; +$result_trees{'text_on_example_command_line'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[2]; +$result_trees{'text_on_example_command_line'}{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'text_on_example_command_line'}{'contents'}[2]{'contents'}[1]; +$result_trees{'text_on_example_command_line'}{'contents'}[2]{'parent'} = $result_trees{'text_on_example_command_line'}; +$result_trees{'text_on_example_command_line'}{'contents'}[3]{'parent'} = $result_trees{'text_on_example_command_line'}; +$result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'} = $result_trees{'text_on_example_command_line'}{'contents'}[4]; +$result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[4]; +$result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[1]; +$result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[4]; +$result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[2]{'args'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[2]; +$result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[4]; +$result_trees{'text_on_example_command_line'}{'contents'}[4]{'extra'}{'end_command'} = $result_trees{'text_on_example_command_line'}{'contents'}[4]{'contents'}[2]; +$result_trees{'text_on_example_command_line'}{'contents'}[4]{'parent'} = $result_trees{'text_on_example_command_line'}; +$result_trees{'text_on_example_command_line'}{'contents'}[5]{'parent'} = $result_trees{'text_on_example_command_line'}; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[1]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[2]{'args'}[0]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[2]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[2]{'parent'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'text_on_example_command_line'}{'contents'}[6]{'contents'}[2]; +$result_trees{'text_on_example_command_line'}{'contents'}[6]{'parent'} = $result_trees{'text_on_example_command_line'}; -$result_texis{'text_on_command_line'} = '@example text on line +$result_texis{'text_on_example_command_line'} = '@example text on line @end example @example text on line followed by text @@ -392,14 +392,14 @@ in example '; -$result_texts{'text_on_command_line'} = ' +$result_texts{'text_on_example_command_line'} = ' normal text in example '; -$result_errors{'text_on_command_line'} = [ +$result_errors{'text_on_example_command_line'} = [ { 'error_line' => ':10: superfluous argument to @end example: text after end ', @@ -421,8 +421,11 @@ $result_errors{'text_on_command_line'} = [ ]; +$result_floats{'text_on_example_command_line'} = {}; -$result_converted{'plaintext'}->{'text_on_command_line'} = ' + + +$result_converted{'plaintext'}->{'text_on_example_command_line'} = ' normal text in example @@ -430,8 +433,8 @@ $result_converted{'plaintext'}->{'text_on_command_line'} = ' '; -$result_converted{'html_text'}->{'text_on_command_line'} = ' -<div class="example"> +$result_converted{'html_text'}->{'text_on_example_command_line'} = ' +<div class="example text-on-line-followed-by-text"> <pre class="example">normal text </pre></div> @@ -442,7 +445,7 @@ $result_converted{'html_text'}->{'text_on_command_line'} = ' '; -$result_converted{'docbook'}->{'text_on_command_line'} = ' +$result_converted{'docbook'}->{'text_on_example_command_line'} = ' <screen>normal text </screen> <screen>in example @@ -450,10 +453,10 @@ $result_converted{'docbook'}->{'text_on_command_line'} = ' '; -$result_converted{'xml'}->{'text_on_command_line'} = '<example spaces=" " endspaces=" "> +$result_converted{'xml'}->{'text_on_example_command_line'} = '<example spaces=" " endspaces=" "><examplelanguage>text on line</examplelanguage> </example> -<example spaces=" " endspaces=" "> +<example spaces=" " endspaces=" "><examplelanguage>text on line followed by text</examplelanguage> <pre xml:space="preserve">normal text </pre></example> diff --git a/macros/texinfo/texinfo/tp/t/results/preformatted/titlefont_in_example.pl b/macros/texinfo/texinfo/tp/t/results/preformatted/titlefont_in_example.pl index c500922ceb..901dfabd77 100644 --- a/macros/texinfo/texinfo/tp/t/results/preformatted/titlefont_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/preformatted/titlefont_in_example.pl @@ -129,10 +129,12 @@ Text. $result_errors{'titlefont_in_example'} = []; +$result_floats{'titlefont_in_example'} = {}; + + $result_converted{'plaintext'}->{'titlefont_in_example'} = ' Title ***** - Text. '; |