diff options
Diffstat (limited to 'macros/texinfo/texinfo/tp/t/results/macro')
69 files changed, 445 insertions, 48 deletions
diff --git a/macros/texinfo/texinfo/tp/t/results/macro/arg_body_expansion_order.pl b/macros/texinfo/texinfo/tp/t/results/macro/arg_body_expansion_order.pl index a65af45d21..2111f45ec7 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/arg_body_expansion_order.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/arg_body_expansion_order.pl @@ -271,4 +271,7 @@ different $result_errors{'arg_body_expansion_order'} = []; +$result_floats{'arg_body_expansion_order'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/arg_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/macro/arg_not_closed.pl index 08613cc6df..2d2c391120 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/arg_not_closed.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/arg_not_closed.pl @@ -106,4 +106,7 @@ $result_errors{'arg_not_closed'} = [ ]; +$result_floats{'arg_not_closed'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/backslash_in_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/backslash_in_arg.pl index fba1138806..f4364bd873 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/backslash_in_arg.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/backslash_in_arg.pl @@ -290,7 +290,9 @@ $result_trees{'backslash_in_arg'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -350,7 +352,7 @@ $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'cont $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[8]; $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[8]{'parent'} = $result_trees{'backslash_in_arg'}{'contents'}[1]; $result_trees{'backslash_in_arg'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'backslash_in_arg'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'backslash_in_arg'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'backslash_in_arg'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'backslash_in_arg'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'backslash_in_arg'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'backslash_in_arg'}{'contents'}[1]{'parent'} = $result_trees{'backslash_in_arg'}; $result_texis{'backslash_in_arg'} = '@node Top @@ -394,4 +396,7 @@ $result_menus{'backslash_in_arg'} = { $result_errors{'backslash_in_arg'} = []; +$result_floats{'backslash_in_arg'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/bad_argument.pl b/macros/texinfo/texinfo/tp/t/results/macro/bad_argument.pl index 7eb4066077..ecff552523 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/bad_argument.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/bad_argument.pl @@ -265,4 +265,7 @@ $result_errors{'bad_argument'} = [ ]; +$result_floats{'bad_argument'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/bad_formal_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/bad_formal_arg.pl index 2e30d7655d..9a473ef7ef 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/bad_formal_arg.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/bad_formal_arg.pl @@ -276,4 +276,7 @@ $result_errors{'bad_formal_arg'} = [ ]; +$result_floats{'bad_formal_arg'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/bad_macro_name_with_underscore.pl b/macros/texinfo/texinfo/tp/t/results/macro/bad_macro_name_with_underscore.pl index 5e85563f67..0b31022e74 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/bad_macro_name_with_underscore.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/bad_macro_name_with_underscore.pl @@ -78,4 +78,7 @@ $result_texts{'bad_macro_name_with_underscore'} = ''; $result_errors{'bad_macro_name_with_underscore'} = []; +$result_floats{'bad_macro_name_with_underscore'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/complete_macro_for_end.pl b/macros/texinfo/texinfo/tp/t/results/macro/complete_macro_for_end.pl index 1e3f875017..84af05b5de 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/complete_macro_for_end.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/complete_macro_for_end.pl @@ -132,4 +132,7 @@ $result_texts{'complete_macro_for_end'} = ' $result_errors{'complete_macro_for_end'} = []; +$result_floats{'complete_macro_for_end'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/complex_argument.pl b/macros/texinfo/texinfo/tp/t/results/macro/complex_argument.pl index b1b78ef501..cf4a8454b2 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/complex_argument.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/complex_argument.pl @@ -701,4 +701,7 @@ $result_errors{'complex_argument'} = [ ]; +$result_floats{'complex_argument'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/double_macro_definition.pl b/macros/texinfo/texinfo/tp/t/results/macro/double_macro_definition.pl index a764c0e2ab..498aff13ef 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/double_macro_definition.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/double_macro_definition.pl @@ -111,4 +111,7 @@ $result_errors{'double_macro_definition'} = [ ]; +$result_floats{'double_macro_definition'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/double_recursive_macro_call.pl b/macros/texinfo/texinfo/tp/t/results/macro/double_recursive_macro_call.pl index c9464a1ff8..b4abd6bb3d 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/double_recursive_macro_call.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/double_recursive_macro_call.pl @@ -171,4 +171,7 @@ $result_errors{'double_recursive_macro_call'} = [ ]; +$result_floats{'double_recursive_macro_call'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/empty_end.pl b/macros/texinfo/texinfo/tp/t/results/macro/empty_end.pl index 7748336b71..adf91594d7 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/empty_end.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/empty_end.pl @@ -70,4 +70,7 @@ $result_texts{'empty_end'} = ''; $result_errors{'empty_end'} = []; +$result_floats{'empty_end'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_argument.pl b/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_argument.pl index 8cb8e770da..fc5d97b6dc 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_argument.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_argument.pl @@ -183,4 +183,7 @@ $result_errors{'empty_macro_argument'} = [ ]; +$result_floats{'empty_macro_argument'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_in_text_no_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_in_text_no_arg.pl index 79c4ee1c96..fa23c09d32 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_in_text_no_arg.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_in_text_no_arg.pl @@ -146,4 +146,7 @@ This 2 see. A. $result_errors{'empty_macro_in_text_no_arg'} = []; +$result_floats{'empty_macro_in_text_no_arg'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_no_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_no_arg.pl index 5b27c3801f..ea9d9bf245 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_no_arg.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/empty_macro_no_arg.pl @@ -87,4 +87,7 @@ $result_texts{'empty_macro_no_arg'} = ' $result_errors{'empty_macro_no_arg'} = []; +$result_floats{'empty_macro_no_arg'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/expand_two_same.pl b/macros/texinfo/texinfo/tp/t/results/macro/expand_two_same.pl index 90d249760c..c108c268b1 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/expand_two_same.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/expand_two_same.pl @@ -237,4 +237,7 @@ With a doubles arg arg with comma , here and re arg with comma , here $result_errors{'expand_two_same'} = []; +$result_floats{'expand_two_same'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/expansion_order.pl b/macros/texinfo/texinfo/tp/t/results/macro/expansion_order.pl index 9c8ac4c7e5..666f4829ef 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/expansion_order.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/expansion_order.pl @@ -169,4 +169,7 @@ $result_texts{'expansion_order'} = ' $result_errors{'expansion_order'} = []; +$result_floats{'expansion_order'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/form_feeds.pl b/macros/texinfo/texinfo/tp/t/results/macro/form_feeds.pl index 7c6dc144c3..3c6ab9e8f2 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/form_feeds.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/form_feeds.pl @@ -231,4 +231,7 @@ g a{rgline v $result_errors{'form_feeds'} = []; +$result_floats{'form_feeds'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/ifclear_in_macro.pl b/macros/texinfo/texinfo/tp/t/results/macro/ifclear_in_macro.pl index 355bdbd953..202477756a 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/ifclear_in_macro.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/ifclear_in_macro.pl @@ -121,4 +121,7 @@ arg $result_errors{'ifclear_in_macro'} = []; +$result_floats{'ifclear_in_macro'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/ifset_and_end_isef_in_macro.pl b/macros/texinfo/texinfo/tp/t/results/macro/ifset_and_end_isef_in_macro.pl index c89012cd6d..c1e4fdb258 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/ifset_and_end_isef_in_macro.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/ifset_and_end_isef_in_macro.pl @@ -141,4 +141,7 @@ $result_errors{'ifset_and_end_isef_in_macro'} = [ ]; +$result_floats{'ifset_and_end_isef_in_macro'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/ifset_in_macro.pl b/macros/texinfo/texinfo/tp/t/results/macro/ifset_in_macro.pl index 8296d3f7c1..580c5bb393 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/ifset_in_macro.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/ifset_in_macro.pl @@ -97,4 +97,7 @@ $result_texts{'ifset_in_macro'} = ' $result_errors{'ifset_in_macro'} = []; +$result_floats{'ifset_in_macro'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/ifset_in_macro_set.pl b/macros/texinfo/texinfo/tp/t/results/macro/ifset_in_macro_set.pl index ec7ed79a52..b04bcac758 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/ifset_in_macro_set.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/ifset_in_macro_set.pl @@ -121,4 +121,7 @@ arg $result_errors{'ifset_in_macro_set'} = []; +$result_floats{'ifset_in_macro_set'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/ignored_macro_definition.pl b/macros/texinfo/texinfo/tp/t/results/macro/ignored_macro_definition.pl index bc0feee787..f568837f4a 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/ignored_macro_definition.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/ignored_macro_definition.pl @@ -157,4 +157,7 @@ outside. $result_errors{'ignored_macro_definition'} = []; +$result_floats{'ignored_macro_definition'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/implicit_quoting_one_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/implicit_quoting_one_arg.pl index 23d003b79e..e923a68f5b 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/implicit_quoting_one_arg.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/implicit_quoting_one_arg.pl @@ -130,4 +130,7 @@ FIXME: Many arguments, separated by commas, are processed here $result_errors{'implicit_quoting_one_arg'} = []; +$result_floats{'implicit_quoting_one_arg'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/implicit_quoting_recursion.pl b/macros/texinfo/texinfo/tp/t/results/macro/implicit_quoting_recursion.pl index 68a05e46ba..1c6ed34ed8 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/implicit_quoting_recursion.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/implicit_quoting_recursion.pl @@ -102,4 +102,7 @@ natopocotuototam $result_errors{'implicit_quoting_recursion'} = []; +$result_floats{'implicit_quoting_recursion'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/include_after_empty_line_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/include_after_empty_line_arg.pl new file mode 100644 index 0000000000..da35b45299 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/macro/include_after_empty_line_arg.pl @@ -0,0 +1,129 @@ +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{'include_after_empty_line_arg'} = { + 'contents' => [ + { + 'args' => [ + { + 'parent' => {}, + 'text' => 'mymacro', + 'type' => 'macro_name' + }, + { + 'parent' => {}, + 'text' => 'body', + 'type' => 'macro_arg' + } + ], + 'cmdname' => 'macro', + 'contents' => [ + { + 'parent' => {}, + 'text' => '@code{\\body\\}', + 'type' => 'raw' + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'last_raw_newline' + } + ], + 'extra' => { + 'arg_line' => ' mymacro{body} +' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, + 'parent' => {} + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line_after_command' + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'args' => [ + { + 'contents' => [], + 'parent' => {}, + 'type' => 'brace_command_arg' + } + ], + 'cmdname' => 'code', + 'contents' => [], + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => 'mymacro' + }, + 'parent' => {} + }, + { + 'parent' => {}, + 'text' => ' +' + }, + { + 'parent' => {}, + 'text' => 'In included file. +' + } + ], + 'parent' => {}, + 'type' => 'paragraph' + } + ], + 'type' => 'text_root' +}; +$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'include_after_empty_line_arg'}{'contents'}[0]; +$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'include_after_empty_line_arg'}{'contents'}[0]; +$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'include_after_empty_line_arg'}{'contents'}[0]; +$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'include_after_empty_line_arg'}{'contents'}[0]; +$result_trees{'include_after_empty_line_arg'}{'contents'}[0]{'parent'} = $result_trees{'include_after_empty_line_arg'}; +$result_trees{'include_after_empty_line_arg'}{'contents'}[1]{'parent'} = $result_trees{'include_after_empty_line_arg'}; +$result_trees{'include_after_empty_line_arg'}{'contents'}[2]{'parent'} = $result_trees{'include_after_empty_line_arg'}; +$result_trees{'include_after_empty_line_arg'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'include_after_empty_line_arg'}{'contents'}[3]{'contents'}[0]; +$result_trees{'include_after_empty_line_arg'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'include_after_empty_line_arg'}{'contents'}[3]; +$result_trees{'include_after_empty_line_arg'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'include_after_empty_line_arg'}{'contents'}[3]; +$result_trees{'include_after_empty_line_arg'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'include_after_empty_line_arg'}{'contents'}[3]; +$result_trees{'include_after_empty_line_arg'}{'contents'}[3]{'parent'} = $result_trees{'include_after_empty_line_arg'}; + +$result_texis{'include_after_empty_line_arg'} = '@macro mymacro{body} +@code{\\body\\} +@end macro + +@code{} +In included file. +'; + + +$result_texts{'include_after_empty_line_arg'} = ' + +In included file. +'; + +$result_errors{'include_after_empty_line_arg'} = []; + + +$result_floats{'include_after_empty_line_arg'} = {}; + + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/leading_spaces_no_ignore.pl b/macros/texinfo/texinfo/tp/t/results/macro/leading_spaces_no_ignore.pl index 3aa976c48b..6f99adce17 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/leading_spaces_no_ignore.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/leading_spaces_no_ignore.pl @@ -112,4 +112,7 @@ Some here $result_errors{'leading_spaces_no_ignore'} = []; +$result_floats{'leading_spaces_no_ignore'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/line_after_recursive_call.pl b/macros/texinfo/texinfo/tp/t/results/macro/line_after_recursive_call.pl index 843019cc6e..f049a20305 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/line_after_recursive_call.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/line_after_recursive_call.pl @@ -120,4 +120,7 @@ $result_errors{'line_after_recursive_call'} = [ ]; +$result_floats{'line_after_recursive_call'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_expands_to_empty.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_expands_to_empty.pl index 875841447e..0067525a91 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_expands_to_empty.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_expands_to_empty.pl @@ -105,4 +105,7 @@ aa $result_errors{'macro_expands_to_empty'} = []; +$result_floats{'macro_expands_to_empty'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_expansion.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_expansion.pl index 3694e78f23..516be03882 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_expansion.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_expansion.pl @@ -628,4 +628,7 @@ $result_errors{'macro_expansion'} = [ ]; +$result_floats{'macro_expansion'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_for_end.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_for_end.pl index aea142c421..93282c2279 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_for_end.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_for_end.pl @@ -137,4 +137,7 @@ $result_texts{'macro_for_end'} = ' $result_errors{'macro_for_end'} = []; +$result_floats{'macro_for_end'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_for_ignored_line_command.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_for_ignored_line_command.pl index 1f5f229dbf..f583f8945d 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_for_ignored_line_command.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_for_ignored_line_command.pl @@ -90,4 +90,7 @@ $result_texts{'macro_for_ignored_line_command'} = ' $result_errors{'macro_for_ignored_line_command'} = []; +$result_floats{'macro_for_ignored_line_command'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_accent.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_accent.pl index 9e1a0d4dd3..7d6767bebc 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_accent.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_accent.pl @@ -325,4 +325,7 @@ a*. $result_errors{'macro_in_accent'} = []; +$result_floats{'macro_in_accent'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_brace_command.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_brace_command.pl index 3eb0829735..17fb427aba 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_brace_command.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_brace_command.pl @@ -177,7 +177,11 @@ $result_trees{'macro_in_brace_command'} = { 'item_number' => 1, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 10, + 'macro' => '' + }, 'parent' => {} }, { @@ -216,7 +220,11 @@ $result_trees{'macro_in_brace_command'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 9, + 'macro' => '' + }, 'parent' => {} } ], @@ -244,14 +252,12 @@ $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[0]{'contents' $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[0]{'contents'}[0]; $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[0]{'contents'}[0]; $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[0]; -$result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[0]{'line_nr'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]; $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1]{'args'}[0]; $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1]; $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1]{'parent'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]; $result_trees{'macro_in_brace_command'}{'contents'}[6]{'extra'}{'command_as_argument'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0]{'contents'}[0]; $result_trees{'macro_in_brace_command'}{'contents'}[6]{'extra'}{'end_command'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1]; -$result_trees{'macro_in_brace_command'}{'contents'}[6]{'line_nr'} = $result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'macro_in_brace_command'}{'contents'}[6]{'parent'} = $result_trees{'macro_in_brace_command'}; $result_texis{'macro_in_brace_command'} = '@macro foo @@ -278,4 +284,7 @@ foo-expansion@bar-expansion, $result_errors{'macro_in_brace_command'} = []; +$result_floats{'macro_in_brace_command'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_end_argument.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_end_argument.pl index f8b32ed6a2..d19adc404a 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_end_argument.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_end_argument.pl @@ -137,4 +137,7 @@ $result_texts{'macro_in_end_argument'} = ' $result_errors{'macro_in_end_argument'} = []; +$result_floats{'macro_in_end_argument'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_ifset.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_ifset.pl index 429b2ecbed..ad6d020256 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_ifset.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_ifset.pl @@ -81,4 +81,7 @@ $result_texts{'macro_in_ifset'} = ' $result_errors{'macro_in_ifset'} = []; +$result_floats{'macro_in_ifset'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl index a4f34f52f7..d108e4dd24 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl @@ -156,4 +156,7 @@ $result_errors{'macro_in_ifset_end_in_arg'} = [ ]; +$result_floats{'macro_in_ifset_end_in_arg'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl index 85e22fbacf..115bcc5794 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl @@ -597,7 +597,11 @@ $result_trees{'macro_in_index_commands'} = { ], 'cmdname' => '\'', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 40, + 'macro' => 'defcodeindexentry' + }, 'parent' => {} }, { @@ -623,7 +627,11 @@ $result_trees{'macro_in_index_commands'} = { ], 'cmdname' => 'dotless', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 40, + 'macro' => 'defcodeindexentry' + }, 'parent' => {} } ], @@ -633,7 +641,11 @@ $result_trees{'macro_in_index_commands'} = { ], 'cmdname' => '^', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 40, + 'macro' => 'defcodeindexentry' + }, 'parent' => {} } ], @@ -867,7 +879,9 @@ $result_trees{'macro_in_index_commands'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -961,15 +975,12 @@ $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0 $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]; -$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]; -$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'line_nr'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'}; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]; @@ -1006,7 +1017,7 @@ $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[12]{'args'}[ $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[12]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[13]{'parent'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'macro_in_index_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'macro_in_index_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'macro_in_index_commands'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_index_commands'}; $result_texis{'macro_in_index_commands'} = '@macro cp @@ -1176,4 +1187,7 @@ $result_indices{'macro_in_index_commands'} = { }; +$result_floats{'macro_in_index_commands'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_invalid_documentencoding.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_invalid_documentencoding.pl index 2ccbb58540..1c83b5597c 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_invalid_documentencoding.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_invalid_documentencoding.pl @@ -118,4 +118,7 @@ $result_errors{'macro_in_invalid_documentencoding'} = [ ]; +$result_floats{'macro_in_invalid_documentencoding'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg.pl index 5ef2f58971..b3d3a6dd9c 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg.pl @@ -245,4 +245,7 @@ a, hello text for macro2 after arg $result_errors{'macro_in_macro_arg'} = []; +$result_floats{'macro_in_macro_arg'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg_simpler.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg_simpler.pl index 507d983d63..3ee0faaba3 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg_simpler.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg_simpler.pl @@ -174,4 +174,7 @@ a, macro2text for macro2 $result_errors{'macro_in_macro_arg_simpler'} = []; +$result_floats{'macro_in_macro_arg_simpler'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_menu.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_menu.pl index b908927a7d..00a4505015 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_menu.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_menu.pl @@ -819,26 +819,10 @@ menu comment * 3rd node: entry. description '; -$result_errors{'macro_in_menu'} = [ - { - 'error_line' => ':26: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 26, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':26: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 26, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'macro_in_menu'} = []; + + +$result_floats{'macro_in_menu'} = {}; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl index f520f02c29..87e09480c6 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl @@ -128,7 +128,9 @@ $result_trees{'macro_in_misc_commands'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -3303,7 +3305,9 @@ $result_trees{'macro_in_misc_commands'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'node-atext' } ], @@ -3516,7 +3520,7 @@ $result_trees{'macro_in_misc_commands'}{'contents'}[0]{'parent'} = $result_trees $result_trees{'macro_in_misc_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[1]{'args'}[0]; $result_trees{'macro_in_misc_commands'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[1]; $result_trees{'macro_in_misc_commands'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'macro_in_misc_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'macro_in_misc_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'macro_in_misc_commands'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'macro_in_misc_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'macro_in_misc_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'macro_in_misc_commands'}{'contents'}[1]{'parent'} = $result_trees{'macro_in_misc_commands'}; $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'args'}[0]; $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[2]; @@ -3933,7 +3937,7 @@ $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'parent'} = $result_trees $result_trees{'macro_in_misc_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[3]{'args'}[0]; $result_trees{'macro_in_misc_commands'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[3]; $result_trees{'macro_in_misc_commands'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'macro_in_misc_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'macro_in_misc_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'macro_in_misc_commands'}{'contents'}[3]{'extra'}{'node_content'}; +$result_trees{'macro_in_misc_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'macro_in_misc_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0]; $result_trees{'macro_in_misc_commands'}{'contents'}[3]{'parent'} = $result_trees{'macro_in_misc_commands'}; $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'args'}[0]; $result_trees{'macro_in_misc_commands'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'macro_in_misc_commands'}{'contents'}[4]; @@ -4388,6 +4392,15 @@ $result_errors{'macro_in_misc_commands'} = [ 'type' => 'error' }, { + 'error_line' => ':58: warning: @definfoenclose is obsolete. +', + 'file_name' => '', + 'line_nr' => 58, + 'macro' => '', + 'text' => '@definfoenclose is obsolete.', + 'type' => 'warning' + }, + { 'error_line' => ':58: warning: @definfoenclose should only appear at the beginning of a line ', 'file_name' => '', @@ -4397,6 +4410,24 @@ $result_errors{'macro_in_misc_commands'} = [ 'type' => 'warning' }, { + 'error_line' => ':65: warning: @definfoenclose is obsolete. +', + 'file_name' => '', + 'line_nr' => 65, + 'macro' => '', + 'text' => '@definfoenclose is obsolete.', + 'type' => 'warning' + }, + { + 'error_line' => ':78: warning: @definfoenclose is obsolete. +', + 'file_name' => '', + 'line_nr' => 78, + 'macro' => '', + 'text' => '@definfoenclose is obsolete.', + 'type' => 'warning' + }, + { 'error_line' => ':125: warning: multiple @footnotestyle ', 'file_name' => '', @@ -4415,6 +4446,15 @@ $result_errors{'macro_in_misc_commands'} = [ 'type' => 'warning' }, { + 'error_line' => ':163: warning: @refill is obsolete. (possibly involving @refillmacro) +', + 'file_name' => '', + 'line_nr' => 163, + 'macro' => 'refillmacro', + 'text' => '@refill is obsolete.', + 'type' => 'warning' + }, + { 'error_line' => ':173: warning: @page should only appear at the beginning of a line (possibly involving @pagemacro) ', 'file_name' => '', @@ -4422,8 +4462,20 @@ $result_errors{'macro_in_misc_commands'} = [ 'macro' => 'pagemacro', 'text' => '@page should only appear at the beginning of a line', 'type' => 'warning' + }, + { + 'error_line' => ':174: warning: @refill is obsolete. (possibly involving @refillmacro) +', + 'file_name' => '', + 'line_nr' => 174, + 'macro' => 'refillmacro', + 'text' => '@refill is obsolete.', + 'type' => 'warning' } ]; +$result_floats{'macro_in_misc_commands'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_name_with_digit.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_name_with_digit.pl index e480c24a4b..924a467f0f 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_name_with_digit.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_name_with_digit.pl @@ -152,4 +152,7 @@ expand some thing macro1 $result_errors{'macro_name_with_digit'} = []; +$result_floats{'macro_name_with_digit'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_name_with_hyphen.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_name_with_hyphen.pl index f7d7d6e1c2..3baad0e7a2 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_name_with_hyphen.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_name_with_hyphen.pl @@ -132,4 +132,7 @@ This blah and that bli-bli. $result_errors{'macro_name_with_hyphen'} = []; +$result_floats{'macro_name_with_hyphen'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_no_arg_bad_expansion.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_no_arg_bad_expansion.pl index 809ad10ee9..0ef979a9ef 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_no_arg_bad_expansion.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_no_arg_bad_expansion.pl @@ -90,4 +90,7 @@ res1 abc $result_errors{'macro_no_arg_bad_expansion'} = []; +$result_floats{'macro_no_arg_bad_expansion'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_no_arg_expansion.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_no_arg_expansion.pl index bc1c157d92..89c5bfbf88 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_no_arg_expansion.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_no_arg_expansion.pl @@ -90,4 +90,7 @@ res1 abc $result_errors{'macro_no_arg_expansion'} = []; +$result_floats{'macro_no_arg_expansion'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_no_argument.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_no_argument.pl index 60095d2551..0da3f07cb9 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_no_argument.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_no_argument.pl @@ -53,4 +53,7 @@ $result_errors{'macro_no_argument'} = [ ]; +$result_floats{'macro_no_argument'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_not_closed.pl index d87c85345e..c47f3dd3ae 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_not_closed.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_not_closed.pl @@ -62,4 +62,7 @@ $result_errors{'macro_not_closed'} = [ ]; +$result_floats{'macro_not_closed'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_one_arg_end_of_file.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_one_arg_end_of_file.pl index 9dc19dd473..a54975909d 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_one_arg_end_of_file.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_one_arg_end_of_file.pl @@ -93,4 +93,7 @@ Arg .'; $result_errors{'macro_one_arg_end_of_file'} = []; +$result_floats{'macro_one_arg_end_of_file'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl index cc98ffc9e2..f09c230899 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl @@ -118,4 +118,7 @@ $result_errors{'macro_with_error_at_end_line_after_macro'} = [ ]; +$result_floats{'macro_with_error_at_end_line_after_macro'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_zero.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_zero.pl index e5dfcab2bc..2a683d6d00 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/macro_zero.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_zero.pl @@ -98,4 +98,7 @@ Macro $result_errors{'macro_zero'} = []; +$result_floats{'macro_zero'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/nested_macro_call.pl b/macros/texinfo/texinfo/tp/t/results/macro/nested_macro_call.pl index 995eb38c64..93aa228d88 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/nested_macro_call.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/nested_macro_call.pl @@ -162,4 +162,7 @@ Before (machin) $result_errors{'nested_macro_call'} = []; +$result_floats{'nested_macro_call'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/no_macrobody.pl b/macros/texinfo/texinfo/tp/t/results/macro/no_macrobody.pl index ed18f48185..51b6124226 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/no_macrobody.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/no_macrobody.pl @@ -99,4 +99,7 @@ $result_texts{'no_macrobody'} = ' $result_errors{'no_macrobody'} = []; +$result_floats{'no_macrobody'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/paragraph_and_macro.pl b/macros/texinfo/texinfo/tp/t/results/macro/paragraph_and_macro.pl index 6fa437636e..b0b7e37402 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/paragraph_and_macro.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/paragraph_and_macro.pl @@ -295,4 +295,7 @@ text after space. $result_errors{'paragraph_and_macro'} = []; +$result_floats{'paragraph_and_macro'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/protect_comma_macro_line.pl b/macros/texinfo/texinfo/tp/t/results/macro/protect_comma_macro_line.pl index 51f3be5519..5c0034ab98 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/protect_comma_macro_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/protect_comma_macro_line.pl @@ -152,4 +152,7 @@ and a last in another paragraph $result_errors{'protect_comma_macro_line'} = []; +$result_floats{'protect_comma_macro_line'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body.pl b/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body.pl index df11d0caa8..c5ae82772e 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body.pl @@ -101,7 +101,11 @@ $result_trees{'protect_in_body'} = { ], 'cmdname' => 'emph', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => 'macroone' + }, 'parent' => {} }, { @@ -123,7 +127,11 @@ $result_trees{'protect_in_body'} = { ], 'cmdname' => 'emph', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => 'macroone' + }, 'parent' => {} }, { @@ -151,12 +159,10 @@ $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'conte $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]; -$result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3]; $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3]; $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[3]{'args'}[0]; $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[3]; -$result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3]; $result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'protect_in_body'}{'contents'}[3]; $result_trees{'protect_in_body'}{'contents'}[3]{'parent'} = $result_trees{'protect_in_body'}; @@ -176,4 +182,7 @@ the result: f\\irst arg protected \\ -> \\arg1\\ second arg after macro. $result_errors{'protect_in_body'} = []; +$result_floats{'protect_in_body'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body_line_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body_line_arg.pl index 610f17bcdb..c75411bb8f 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body_line_arg.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body_line_arg.pl @@ -99,7 +99,11 @@ $result_trees{'protect_in_body_line_arg'} = { ], 'cmdname' => 'emph', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => 'macroone' + }, 'parent' => {} }, { @@ -153,7 +157,6 @@ $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[1]{'args'}[ $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[3]; $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[3]; $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[3]; -$result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[1]{'line_nr'}; $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[3]; $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[3]; $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[5]{'args'}[0]; @@ -187,4 +190,7 @@ $result_errors{'protect_in_body_line_arg'} = [ ]; +$result_floats{'protect_in_body_line_arg'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body_one_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body_one_arg.pl index d4097373ac..512b31b8e8 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body_one_arg.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/protect_in_body_one_arg.pl @@ -101,7 +101,11 @@ $result_trees{'protect_in_body_one_arg'} = { ], 'cmdname' => 'emph', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => 'macroone' + }, 'parent' => {} }, { @@ -118,7 +122,11 @@ $result_trees{'protect_in_body_one_arg'} = { ], 'cmdname' => 'emph', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => 'macroone' + }, 'parent' => {} }, { @@ -146,11 +154,9 @@ $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0 $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0]; $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]; -$result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3]; $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3]; $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[3]; -$result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3]; $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'protect_in_body_one_arg'}{'contents'}[3]; $result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'parent'} = $result_trees{'protect_in_body_one_arg'}; @@ -170,4 +176,7 @@ result: f\\irst arg protected \\ -> \\arg1\\ $result_errors{'protect_in_body_one_arg'} = []; +$result_floats{'protect_in_body_one_arg'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/recursive_call_in_argument.pl b/macros/texinfo/texinfo/tp/t/results/macro/recursive_call_in_argument.pl index 1fa3b530d3..4bf0cc1473 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/recursive_call_in_argument.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/recursive_call_in_argument.pl @@ -96,4 +96,7 @@ a $result_errors{'recursive_call_in_argument'} = []; +$result_floats{'recursive_call_in_argument'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/recursive_call_in_macro.pl b/macros/texinfo/texinfo/tp/t/results/macro/recursive_call_in_macro.pl index b89c6031cd..72ce18c86f 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/recursive_call_in_macro.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/recursive_call_in_macro.pl @@ -100,4 +100,7 @@ $result_errors{'recursive_call_in_macro'} = [ ]; +$result_floats{'recursive_call_in_macro'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/redefine_texinfo_macro.pl b/macros/texinfo/texinfo/tp/t/results/macro/redefine_texinfo_macro.pl index 27cfe38790..b72f4c6816 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/redefine_texinfo_macro.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/redefine_texinfo_macro.pl @@ -131,4 +131,7 @@ $result_errors{'redefine_texinfo_macro'} = [ ]; +$result_floats{'redefine_texinfo_macro'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/simple_imbricated_macro.pl b/macros/texinfo/texinfo/tp/t/results/macro/simple_imbricated_macro.pl index cdb95b7fbd..53c0c600d2 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/simple_imbricated_macro.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/simple_imbricated_macro.pl @@ -189,4 +189,7 @@ bidule. $result_errors{'simple_imbricated_macro'} = []; +$result_floats{'simple_imbricated_macro'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/space_macro_after_end.pl b/macros/texinfo/texinfo/tp/t/results/macro/space_macro_after_end.pl index 359ace5f3c..57acf9da4a 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/space_macro_after_end.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/space_macro_after_end.pl @@ -149,4 +149,7 @@ $result_texts{'space_macro_after_end'} = ' $result_errors{'space_macro_after_end'} = []; +$result_floats{'space_macro_after_end'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/space_macro_after_end_verbatim.pl b/macros/texinfo/texinfo/tp/t/results/macro/space_macro_after_end_verbatim.pl index b37ab8b976..b90882da78 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/space_macro_after_end_verbatim.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/space_macro_after_end_verbatim.pl @@ -124,4 +124,7 @@ $result_errors{'space_macro_after_end_verbatim'} = [ ]; +$result_floats{'space_macro_after_end_verbatim'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/text_before_after.pl b/macros/texinfo/texinfo/tp/t/results/macro/text_before_after.pl index 9d34e1cddb..107207183f 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/text_before_after.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/text_before_after.pl @@ -103,4 +103,7 @@ $result_errors{'text_before_after'} = [ ]; +$result_floats{'text_before_after'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/too_much_args.pl b/macros/texinfo/texinfo/tp/t/results/macro/too_much_args.pl index 0538415ad5..573264b742 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/too_much_args.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/too_much_args.pl @@ -128,4 +128,7 @@ $result_errors{'too_much_args'} = [ ]; +$result_floats{'too_much_args'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/two_macros_on_a_line.pl b/macros/texinfo/texinfo/tp/t/results/macro/two_macros_on_a_line.pl index eb1b9643ee..11799bab59 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/two_macros_on_a_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/two_macros_on_a_line.pl @@ -434,4 +434,7 @@ after in mymacro $result_errors{'two_macros_on_a_line'} = []; +$result_floats{'two_macros_on_a_line'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/unknown_macro_on_line_command.pl b/macros/texinfo/texinfo/tp/t/results/macro/unknown_macro_on_line_command.pl index 40ae5ac11f..b6399a20a7 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/unknown_macro_on_line_command.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/unknown_macro_on_line_command.pl @@ -75,4 +75,7 @@ $result_errors{'unknown_macro_on_line_command'} = [ ]; +$result_floats{'unknown_macro_on_line_command'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/macro/zero_argument.pl b/macros/texinfo/texinfo/tp/t/results/macro/zero_argument.pl index 98b3a4de95..4de7f9a8ab 100644 --- a/macros/texinfo/texinfo/tp/t/results/macro/zero_argument.pl +++ b/macros/texinfo/texinfo/tp/t/results/macro/zero_argument.pl @@ -120,4 +120,7 @@ $result_texts{'zero_argument'} = ' $result_errors{'zero_argument'} = []; +$result_floats{'zero_argument'} = {}; + + 1; |