texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp t/test_utils.pl t/results/alias/bad_...


From: Patrice Dumas
Subject: texinfo/tp t/test_utils.pl t/results/alias/bad_...
Date: Sun, 17 Oct 2010 09:12:52 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/17 09:12:52

Modified files:
        tp/t           : test_utils.pl 
        tp/t/results/alias: bad_line.pl simple.pl 
        tp/t/results/columnfractions: empty.pl empty_comment.pl good.pl 
                                      good_comment.pl 
                                      good_space_comment.pl 
                                      not_fraction.pl wrong_command.pl 
        tp/t/results/conditionals: consecutive_conditionals.pl 
                                   empty_set_in_ifclear.pl 
                                   empty_set_in_ifset.pl 
                                   ifnot_format_conditional.pl 
                                   nested_ignore.pl not_set.pl 
        tp/t/results/coverage: accents.pl block_commands.pl commands.pl 
                               def.pl item_container.pl math.pl 
                               multitable.pl nested_block_commands.pl 
                               preformatted.pl table.pl 
                               table_command_comment.pl 
        tp/t/results/coverage_braces: footnote.pl nested.pl 
                                      nested_args.pl no_brace.pl 
                                      simple.pl too_much_args.pl 
        tp/t/results/itemize: accent_argument.pl w_argument.pl 
        tp/t/results/macro: arg_body_expansion_order.pl 
                            arg_not_closed.pl bad_argument.pl 
                            bad_formal_arg.pl complete_macro_for_end.pl 
                            complex_argument.pl empty_end.pl 
                            expand_two_same.pl expansion_order.pl 
                            ifclear_in_macro.pl ifset_in_macro.pl 
                            ifset_in_macro_set.pl 
                            implicit_quoting_one_arg.pl 
                            implicit_quoting_recursion.pl 
                            macro_expansion.pl macro_for_end.pl 
                            macro_in_accent.pl macro_in_brace_command.pl 
                            macro_in_end_argument.pl macro_in_ifset.pl 
                            macro_in_ifset_end_in_arg.pl 
                            macro_in_index_commands.pl 
                            macro_in_macro_arg.pl 
                            macro_in_macro_arg_simpler.pl 
                            macro_in_menu.pl macro_in_misc_commands.pl 
                            macro_no_arg_bad_expansion.pl 
                            macro_no_arg_expansion.pl 
                            macro_no_argument.pl macro_not_closed.pl 
                            macro_one_arg_end_of_file.pl macro_zero.pl 
                            nested_macro_call.pl no_macrobody.pl 
                            paragraph_and_macro.pl 
                            protect_comma_macro_line.pl 
                            protect_in_body.pl 
                            protect_in_body_line_arg.pl 
                            protect_in_body_one_arg.pl 
                            space_macro_after_end.pl 
                            text_before_after.pl too_much_args.pl 
                            two_macros_on_a_line.pl zero_argument.pl 
        tp/t/results/menu: bad_beginning.pl detailmenu.pl 
                           menu_entry_name.pl menu_entry_name_comment.pl 
                           menu_entry_no_entry.pl menu_entry_node.pl 
                           menu_entry_node_comments.pl simple.pl 
        tp/t/results/misc_commands: also_not_line.pl bad.pl 
                                    clickstyle.pl 
                                    command_line_in_paragraph.pl 
                                    contents.pl definfoenclose.pl 
                                    index_entries.pl 
                                    invalid_clickstyle.pl many_lines.pl 
                                    simple.pl sp.pl 
        tp/t/results/paragraph: close_paragraph_command.pl 
                                comment_between_text.pl 
                                no_paragraph_commands.pl 
                                paragraph_command.pl text.pl 
                                text_comment.pl text_line.pl 
                                text_space_comment.pl two_lines.pl 
        tp/t/results/raw: misc_raw.pl misc_raw_comments.pl 
                          nested_macros.pl raw_in_para.pl 
        tp/t/results/sectioning: node.pl sections.pl 
        tp/t/results/value: bad_syntax.pl empty_set.pl 
                            empty_value_in_line.pl simple.pl 
                            value_after_accent.pl 
                            value_in_index_commands.pl 
                            value_in_misc_commands.pl value_in_node.pl 
                            value_node_directions.pl value_zero.pl 
        tp/t/results/value_and_macro: comma_value_in_macro_arg.pl 
                                      macro_in_value.pl 
                                      value_in_macro_body.pl 
                                      value_in_macro_formal_arg.pl 
        tp/t/results/verb: comments.pl end_of_line.pl multiline.pl 
                           nested.pl simple.pl 
Added files:
        tp/Texinfo/Convert: Text.pm 

Log message:
        Add converter to simple text.
        Rename result_texts as result_texis in test suite.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/alias/bad_line.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/alias/simple.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/empty.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/empty_comment.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/good.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/good_comment.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/good_space_comment.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/not_fraction.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/wrong_command.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/conditionals/consecutive_conditionals.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/conditionals/empty_set_in_ifclear.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/conditionals/empty_set_in_ifset.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/conditionals/ifnot_format_conditional.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/conditionals/nested_ignore.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/conditionals/not_set.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/accents.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/math.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/nested_block_commands.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/footnote.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested_args.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/no_brace.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/simple.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/too_much_args.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/accent_argument.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/w_argument.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/arg_body_expansion_order.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/arg_not_closed.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/bad_argument.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/bad_formal_arg.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/complete_macro_for_end.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/complex_argument.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/empty_end.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/expand_two_same.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/expansion_order.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/ifclear_in_macro.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/ifset_in_macro.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/ifset_in_macro_set.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/implicit_quoting_one_arg.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/implicit_quoting_recursion.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_expansion.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_for_end.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_accent.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_brace_command.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_end_argument.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_ifset.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_index_commands.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_macro_arg.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_macro_arg_simpler.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_menu.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_no_arg_bad_expansion.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_no_arg_expansion.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_no_argument.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_not_closed.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_one_arg_end_of_file.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_zero.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/nested_macro_call.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/no_macrobody.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/paragraph_and_macro.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_comma_macro_line.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_in_body.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_in_body_line_arg.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_in_body_one_arg.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/space_macro_after_end.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/text_before_after.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/too_much_args.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/two_macros_on_a_line.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/zero_argument.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/bad_beginning.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_name.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_name_comment.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_no_entry.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_node.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_node_comments.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/also_not_line.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/bad.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/clickstyle.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/command_line_in_paragraph.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/contents.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/definfoenclose.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/index_entries.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/invalid_clickstyle.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/many_lines.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/simple.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/sp.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/close_paragraph_command.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/comment_between_text.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/paragraph_command.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/text.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/text_comment.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/text_line.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/text_space_comment.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/two_lines.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/misc_raw.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/misc_raw_comments.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/nested_macros.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_in_para.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/sections.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/bad_syntax.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/empty_set.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/empty_value_in_line.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/simple.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_after_accent.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_index_commands.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_misc_commands.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_node.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_node_directions.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_zero.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value_and_macro/macro_in_value.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value_and_macro/value_in_macro_body.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/verb/comments.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/verb/end_of_line.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/verb/multiline.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/verb/nested.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/verb/simple.pl?cvsroot=texinfo&r1=1.2&r2=1.3

Patches:
Index: t/test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/test_utils.pl     16 Oct 2010 09:37:06 -0000      1.17
+++ t/test_utils.pl     17 Oct 2010 09:12:50 -0000      1.18
@@ -2,6 +2,7 @@
 
 use Test::More;
 use Texinfo::Parser qw(:all);
+use Texinfo::Convert::Text;
 use Data::Dumper;
 use Data::Compare;
 use File::Basename;
@@ -10,7 +11,7 @@
 #use Struct::Compare;
 use Getopt::Long qw(GetOptions);
 
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 ok(1);
 
@@ -69,6 +70,7 @@
   }
 
   my ($errors, $error_nrs) = $parser->errors();
+  my $converted_text = Texinfo::Convert::Text::convert($result);
 
   my $file = "t/results/$self->{'name'}/$test_name.pl";
   my $new_file = $file.'.new';
@@ -82,7 +84,7 @@
     $out_file = $file if ($self->{'generate'});
 
     open (OUT, ">$out_file") or die "Open $out_file: $!\n";
-    print OUT 'use vars qw(%result_texts %result_trees 
%result_errors);'."\n\n";
+    print OUT 'use vars qw(%result_texis %result_trees 
%result_errors);'."\n\n";
 
     #print STDERR "Generate: ".Data::Dumper->Dump([$result], ['$res']);
     my $out_result = "".Data::Dumper->Dump([$result], 
['$result_trees{\''.$test_name.'\'}']);
@@ -90,7 +92,7 @@
     my $perl_string_result = $texi_string_result;
     $perl_string_result =~ s/\\/\\\\/g;
     $perl_string_result =~ s/'/\\'/g;
-    $out_result .= "\n".'$result_texts{\''.$test_name.'\'} = 
\''.$perl_string_result."';\n\n";
+    $out_result .= "\n".'$result_texis{\''.$test_name.'\'} = 
\''.$perl_string_result."';\n\n";
     $out_result .= "".Data::Dumper->Dump([$errors], 
['$result_errors{\''.$test_name.'\'}']) ."\n\n";
     print OUT $out_result;
     close (OUT);
@@ -124,8 +126,8 @@
     #ok(Struct::Compare::compare($result, $result_trees{$test_name}), 
$test_name.' tree' );
     #ok (Data::Compare::Compare($result, $result_trees{$test_name}), 
$test_name.' tree' );
     ok (Data::Compare::Compare($errors, $result_errors{$test_name}), 
$test_name.' errors' );
-    ok (tree_to_texi($result) eq $result_texts{$test_name}, $test_name.' text' 
);
-    #is (tree_to_texi($result), $result_texts{$test_name}, $test_name.' text' 
);
+    ok (tree_to_texi($result) eq $result_texis{$test_name}, $test_name.' text' 
);
+    #is (tree_to_texi($result), $result_texis{$test_name}, $test_name.' text' 
);
   }
   #exit;
 }

Index: t/results/alias/bad_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/alias/bad_line.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/alias/bad_line.pl 12 Oct 2010 16:45:07 -0000      1.6
+++ t/results/alias/bad_line.pl 17 Oct 2010 09:12:50 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'bad_line'} = {
   'contents' => [
@@ -109,7 +109,7 @@
 $result_trees{'bad_line'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'bad_line'}{'contents'}[3];
 $result_trees{'bad_line'}{'contents'}[3]{'parent'} = $result_trees{'bad_line'};
 
-$result_texts{'bad_line'} = '
+$result_texis{'bad_line'} = '
 @alias garbage-on-line =cmd garbage
 
 @alias garbage-on-line =cmd @code{in code}

Index: t/results/alias/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/alias/simple.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/alias/simple.pl   12 Oct 2010 16:45:07 -0000      1.6
+++ t/results/alias/simple.pl   17 Oct 2010 09:12:50 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'simple'} = {
   'contents' => [
@@ -263,7 +263,7 @@
 $result_trees{'simple'}{'contents'}[8]{'parent'} = $result_trees{'simple'};
 $result_trees{'simple'}{'contents'}[9]{'parent'} = $result_trees{'simple'};
 
-$result_texts{'simple'} = '@alias myalias = code
+$result_texis{'simple'} = '@alias myalias = code
 
 @alias o-theralias=verb @c comment
 

Index: t/results/columnfractions/empty.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/columnfractions/empty.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/columnfractions/empty.pl  12 Oct 2010 16:45:07 -0000      1.7
+++ t/results/columnfractions/empty.pl  17 Oct 2010 09:12:50 -0000      1.8
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'empty'} = {
   'contents' => [
@@ -63,7 +63,7 @@
 $result_trees{'empty'}{'contents'}[0]{'parent'} = $result_trees{'empty'};
 $result_trees{'empty'}{'contents'}[1]{'parent'} = $result_trees{'empty'};
 
-$result_texts{'empty'} = '@multitable @columnfractions 
+$result_texis{'empty'} = '@multitable @columnfractions 
 @end multitable';
 
 $result_errors{'empty'} = [

Index: t/results/columnfractions/empty_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/columnfractions/empty_comment.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/columnfractions/empty_comment.pl  12 Oct 2010 16:45:07 -0000      
1.7
+++ t/results/columnfractions/empty_comment.pl  17 Oct 2010 09:12:50 -0000      
1.8
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'empty_comment'} = {
   'contents' => [
@@ -76,7 +76,7 @@
 $result_trees{'empty_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_comment'};
 $result_trees{'empty_comment'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_comment'};
 
-$result_texts{'empty_comment'} = '@multitable @columnfractions @c
+$result_texis{'empty_comment'} = '@multitable @columnfractions @c
 @end multitable';
 
 $result_errors{'empty_comment'} = [

Index: t/results/columnfractions/good.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/columnfractions/good.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/columnfractions/good.pl   12 Oct 2010 16:45:07 -0000      1.7
+++ t/results/columnfractions/good.pl   17 Oct 2010 09:12:50 -0000      1.8
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'good'} = {
   'contents' => [
@@ -74,7 +74,7 @@
 $result_trees{'good'}{'contents'}[0]{'parent'} = $result_trees{'good'};
 $result_trees{'good'}{'contents'}[1]{'parent'} = $result_trees{'good'};
 
-$result_texts{'good'} = '@multitable @columnfractions 0.4 .6 5.
+$result_texis{'good'} = '@multitable @columnfractions 0.4 .6 5.
 @end multitable';
 
 $result_errors{'good'} = [];

Index: t/results/columnfractions/good_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/columnfractions/good_comment.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/columnfractions/good_comment.pl   12 Oct 2010 16:45:07 -0000      
1.7
+++ t/results/columnfractions/good_comment.pl   17 Oct 2010 09:12:50 -0000      
1.8
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'good_comment'} = {
   'contents' => [
@@ -87,7 +87,7 @@
 $result_trees{'good_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'good_comment'};
 $result_trees{'good_comment'}{'contents'}[1]{'parent'} = 
$result_trees{'good_comment'};
 
-$result_texts{'good_comment'} = '@multitable @columnfractions 0.4 .6 
address@hidden comment
+$result_texis{'good_comment'} = '@multitable @columnfractions 0.4 .6 
address@hidden comment
 @end multitable';
 
 $result_errors{'good_comment'} = [];

Index: t/results/columnfractions/good_space_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/columnfractions/good_space_comment.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/columnfractions/good_space_comment.pl     12 Oct 2010 16:45:07 
-0000      1.7
+++ t/results/columnfractions/good_space_comment.pl     17 Oct 2010 09:12:50 
-0000      1.8
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'good_space_comment'} = {
   'contents' => [
@@ -86,7 +86,7 @@
 $result_trees{'good_space_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'good_space_comment'};
 $result_trees{'good_space_comment'}{'contents'}[1]{'parent'} = 
$result_trees{'good_space_comment'};
 
-$result_texts{'good_space_comment'} = '@multitable @columnfractions 0 1  @c 
space comment
+$result_texis{'good_space_comment'} = '@multitable @columnfractions 0 1  @c 
space comment
 @end multitable';
 
 $result_errors{'good_space_comment'} = [];

Index: t/results/columnfractions/not_fraction.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/columnfractions/not_fraction.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/columnfractions/not_fraction.pl   12 Oct 2010 16:45:07 -0000      
1.7
+++ t/results/columnfractions/not_fraction.pl   17 Oct 2010 09:12:50 -0000      
1.8
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'not_fraction'} = {
   'contents' => [
@@ -68,7 +68,7 @@
 $result_trees{'not_fraction'}{'contents'}[0]{'parent'} = 
$result_trees{'not_fraction'};
 $result_trees{'not_fraction'}{'contents'}[1]{'parent'} = 
$result_trees{'not_fraction'};
 
-$result_texts{'not_fraction'} = '@multitable @columnfractions aaa
+$result_texis{'not_fraction'} = '@multitable @columnfractions aaa
 @end multitable';
 
 $result_errors{'not_fraction'} = [

Index: t/results/columnfractions/wrong_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/columnfractions/wrong_command.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/columnfractions/wrong_command.pl  12 Oct 2010 16:45:07 -0000      
1.8
+++ t/results/columnfractions/wrong_command.pl  17 Oct 2010 09:12:50 -0000      
1.9
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'wrong_command'} = {
   'contents' => [
@@ -89,7 +89,7 @@
 $result_trees{'wrong_command'}{'contents'}[0]{'parent'} = 
$result_trees{'wrong_command'};
 $result_trees{'wrong_command'}{'contents'}[1]{'parent'} = 
$result_trees{'wrong_command'};
 
-$result_texts{'wrong_command'} = '@multitable @columnfractions @b{3.4} 
+$result_texis{'wrong_command'} = '@multitable @columnfractions @b{3.4} 
 @end multitable';
 
 $result_errors{'wrong_command'} = [

Index: t/results/conditionals/consecutive_conditionals.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/conditionals/consecutive_conditionals.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/conditionals/consecutive_conditionals.pl  12 Oct 2010 09:59:14 
-0000      1.1
+++ t/results/conditionals/consecutive_conditionals.pl  17 Oct 2010 09:12:50 
-0000      1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'consecutive_conditionals'} = {
   'contents' => [
@@ -42,7 +42,7 @@
 $result_trees{'consecutive_conditionals'}{'contents'}[1]{'parent'} = 
$result_trees{'consecutive_conditionals'};
 $result_trees{'consecutive_conditionals'}{'contents'}[2]{'parent'} = 
$result_trees{'consecutive_conditionals'};
 
-$result_texts{'consecutive_conditionals'} = '
+$result_texis{'consecutive_conditionals'} = '
 @set b
 
 ';

Index: t/results/conditionals/empty_set_in_ifclear.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/conditionals/empty_set_in_ifclear.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/conditionals/empty_set_in_ifclear.pl      12 Oct 2010 09:59:14 
-0000      1.2
+++ t/results/conditionals/empty_set_in_ifclear.pl      17 Oct 2010 09:12:50 
-0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'empty_set_in_ifclear'} = {
   'contents' => [
@@ -35,7 +35,7 @@
 $result_trees{'empty_set_in_ifclear'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_set_in_ifclear'};
 $result_trees{'empty_set_in_ifclear'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_set_in_ifclear'};
 
-$result_texts{'empty_set_in_ifclear'} = '@set a
+$result_texis{'empty_set_in_ifclear'} = '@set a
 
 ';
 

Index: t/results/conditionals/empty_set_in_ifset.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/conditionals/empty_set_in_ifset.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/conditionals/empty_set_in_ifset.pl        12 Oct 2010 09:59:14 
-0000      1.2
+++ t/results/conditionals/empty_set_in_ifset.pl        17 Oct 2010 09:12:50 
-0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'empty_set_in_ifset'} = {
   'contents' => [
@@ -48,7 +48,7 @@
 $result_trees{'empty_set_in_ifset'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'empty_set_in_ifset'}{'contents'}[2];
 $result_trees{'empty_set_in_ifset'}{'contents'}[2]{'parent'} = 
$result_trees{'empty_set_in_ifset'};
 
-$result_texts{'empty_set_in_ifset'} = '@set a
+$result_texis{'empty_set_in_ifset'} = '@set a
 
 a is set to:||.
 ';

Index: t/results/conditionals/ifnot_format_conditional.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/conditionals/ifnot_format_conditional.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/conditionals/ifnot_format_conditional.pl  16 Oct 2010 09:37:06 
-0000      1.1
+++ t/results/conditionals/ifnot_format_conditional.pl  17 Oct 2010 09:12:50 
-0000      1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'ifnot_format_conditional'} = {
   'contents' => [
@@ -37,7 +37,7 @@
 
$result_trees{'ifnot_format_conditional'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'ifnot_format_conditional'}{'contents'}[2];
 $result_trees{'ifnot_format_conditional'}{'contents'}[2]{'parent'} = 
$result_trees{'ifnot_format_conditional'};
 
-$result_texts{'ifnot_format_conditional'} = 'not tex
+$result_texis{'ifnot_format_conditional'} = 'not tex
 
 After.';
 

Index: t/results/conditionals/nested_ignore.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/conditionals/nested_ignore.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/conditionals/nested_ignore.pl     12 Oct 2010 09:59:14 -0000      
1.3
+++ t/results/conditionals/nested_ignore.pl     17 Oct 2010 09:12:50 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'nested_ignore'} = {
   'contents' => [
@@ -124,7 +124,7 @@
 $result_trees{'nested_ignore'}{'contents'}[6]{'parent'} = 
$result_trees{'nested_ignore'};
 $result_trees{'nested_ignore'}{'contents'}[7]{'parent'} = 
$result_trees{'nested_ignore'};
 
-$result_texts{'nested_ignore'} = '@ignore
+$result_texis{'nested_ignore'} = '@ignore
 @ignore
 
 @end ignore

Index: t/results/conditionals/not_set.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/conditionals/not_set.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/conditionals/not_set.pl   3 Oct 2010 11:51:37 -0000       1.1
+++ t/results/conditionals/not_set.pl   17 Oct 2010 09:12:50 -0000      1.2
@@ -1,10 +1,10 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'not_set'} = {
   'contents' => []
 };
 
-$result_texts{'not_set'} = '';
+$result_texis{'not_set'} = '';
 
 $result_errors{'not_set'} = [];
 

Index: t/results/coverage/accents.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/accents.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/accents.pl       12 Oct 2010 09:59:14 -0000      1.4
+++ t/results/coverage/accents.pl       17 Oct 2010 09:12:50 -0000      1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'accents'} = {
   'contents' => [
@@ -211,7 +211,7 @@
 $result_trees{'accents'}{'contents'}[5]{'parent'} = $result_trees{'accents'};
 $result_trees{'accents'}{'contents'}[6]{'parent'} = $result_trees{'accents'};
 
-$result_texts{'accents'} = '@ringaccent    a
+$result_texis{'accents'} = '@ringaccent    a
 
 accent at end of line @ringaccent
 accent at end of line and spaces @ringaccent

Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage/block_commands.pl        13 Oct 2010 23:21:39 -0000      
1.5
+++ t/results/coverage/block_commands.pl        17 Oct 2010 09:12:50 -0000      
1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'block_commands'} = {
   'contents' => [
@@ -229,7 +229,7 @@
 $result_trees{'block_commands'}{'contents'}[7]{'parent'} = 
$result_trees{'block_commands'};
 $result_trees{'block_commands'}{'contents'}[8]{'parent'} = 
$result_trees{'block_commands'};
 
-$result_texts{'block_commands'} = '
+$result_texis{'block_commands'} = '
 @group
 in group
 @end group

Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage/commands.pl      13 Oct 2010 23:21:39 -0000      1.7
+++ t/results/coverage/commands.pl      17 Oct 2010 09:12:50 -0000      1.8
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'commands'} = {
   'contents' => [
@@ -308,7 +308,7 @@
 $result_trees{'commands'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'commands'}{'contents'}[4];
 $result_trees{'commands'}{'contents'}[4]{'parent'} = $result_trees{'commands'};
 
-$result_texts{'commands'} = '@@ @TeX{} @
+$result_texis{'commands'} = '@@ @TeX{} @
 @"e @address@hidden @~{a} @ringaccent a
 @email{a, b}
 

Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/coverage/def.pl   12 Oct 2010 16:45:07 -0000      1.6
+++ t/results/coverage/def.pl   17 Oct 2010 09:12:50 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'def'} = {
   'contents' => [
@@ -840,7 +840,7 @@
 $result_trees{'def'}{'contents'}[7]{'parent'} = $result_trees{'def'};
 $result_trees{'def'}{'contents'}[8]{'parent'} = $result_trees{'def'};
 
-$result_texts{'def'} = '
+$result_texis{'def'} = '
 @deffn {c--ategory} d--effn_name a--rguments...
 d--effn
 @end deffn

Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage/item_container.pl        12 Oct 2010 11:33:50 -0000      
1.5
+++ t/results/coverage/item_container.pl        17 Oct 2010 09:12:50 -0000      
1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'item_container'} = {
   'contents' => [
@@ -160,7 +160,7 @@
 $result_trees{'item_container'}{'contents'}[4]{'parent'} = 
$result_trees{'item_container'};
 $result_trees{'item_container'}{'contents'}[5]{'parent'} = 
$result_trees{'item_container'};
 
-$result_texts{'item_container'} = '
+$result_texis{'item_container'} = '
 @itemize +
 @item i--tem +
 @end itemize

Index: t/results/coverage/math.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/math.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/coverage/math.pl  12 Oct 2010 19:15:25 -0000      1.1
+++ t/results/coverage/math.pl  17 Oct 2010 09:12:50 -0000      1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'math'} = {
   'contents' => [
@@ -325,7 +325,7 @@
 $result_trees{'math'}{'contents'}[6]{'parent'} = $result_trees{'math'};
 $result_trees{'math'}{'contents'}[7]{'parent'} = $result_trees{'math'};
 
-$result_texts{'math'} = 'Simple math
+$result_texis{'math'} = 'Simple math
 @math{{x^i}\\over{\\tan y}}
 
 Math with @@-command

Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/coverage/multitable.pl    12 Oct 2010 16:45:07 -0000      1.6
+++ t/results/coverage/multitable.pl    17 Oct 2010 09:12:50 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'multitable'} = {
   'contents' => [
@@ -486,7 +486,7 @@
 $result_trees{'multitable'}{'contents'}[4]{'special'}{'prototypes'}[1] = 
$result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[3];
 $result_trees{'multitable'}{'contents'}[5]{'parent'} = 
$result_trees{'multitable'};
 
-$result_texts{'multitable'} = '
+$result_texis{'multitable'} = '
 @multitable @columnfractions 6 7
 @headitem mu--ltitable headitem @tab another tab
 @item mu--ltitable item @tab multitable tab

Index: t/results/coverage/nested_block_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/nested_block_commands.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage/nested_block_commands.pl 16 Oct 2010 21:35:30 -0000      
1.2
+++ t/results/coverage/nested_block_commands.pl 17 Oct 2010 09:12:50 -0000      
1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'nested_block_commands'} = {
   'contents' => [
@@ -955,7 +955,7 @@
 $result_trees{'nested_block_commands'}{'contents'}[33]{'parent'} = 
$result_trees{'nested_block_commands'};
 $result_trees{'nested_block_commands'}{'contents'}[34]{'parent'} = 
$result_trees{'nested_block_commands'};
 
-$result_texts{'nested_block_commands'} = '@group
+$result_texis{'nested_block_commands'} = '@group
 In group
 @quotation
 in quotation

Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage/preformatted.pl  12 Oct 2010 16:45:07 -0000      1.5
+++ t/results/coverage/preformatted.pl  17 Oct 2010 09:12:50 -0000      1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'preformatted'} = {
   'contents' => [
@@ -166,7 +166,7 @@
 $result_trees{'preformatted'}{'contents'}[4]{'parent'} = 
$result_trees{'preformatted'};
 $result_trees{'preformatted'}{'contents'}[5]{'parent'} = 
$result_trees{'preformatted'};
 
-$result_texts{'preformatted'} = '
+$result_texis{'preformatted'} = '
 @example
 e--xample  some  
 

Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/table.pl 12 Oct 2010 16:45:07 -0000      1.4
+++ t/results/coverage/table.pl 17 Oct 2010 09:12:50 -0000      1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'table'} = {
   'contents' => [
@@ -353,7 +353,7 @@
 $result_trees{'table'}{'contents'}[4]{'parent'} = $result_trees{'table'};
 $result_trees{'table'}{'contents'}[5]{'parent'} = $result_trees{'table'};
 
-$result_texts{'table'} = '
+$result_texis{'table'} = '
 @table @asis
 @item table item
 @itemx table itemx

Index: t/results/coverage/table_command_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/coverage/table_command_comment.pl 12 Oct 2010 16:45:07 -0000      
1.3
+++ t/results/coverage/table_command_comment.pl 17 Oct 2010 09:12:50 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'table_command_comment'} = {
   'contents' => [
@@ -85,7 +85,7 @@
 $result_trees{'table_command_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'table_command_comment'};
 $result_trees{'table_command_comment'}{'contents'}[1]{'parent'} = 
$result_trees{'table_command_comment'};
 
-$result_texts{'table_command_comment'} = '@table @address@hidden in comment
+$result_texis{'table_command_comment'} = '@table @address@hidden in comment
 @item item
 @end table';
 

Index: t/results/coverage_braces/footnote.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/coverage_braces/footnote.pl       9 Oct 2010 17:51:37 -0000       
1.3
+++ t/results/coverage_braces/footnote.pl       17 Oct 2010 09:12:50 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'footnote'} = {
   'contents' => [
@@ -90,7 +90,7 @@
 $result_trees{'footnote'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'footnote'}{'contents'}[0];
 $result_trees{'footnote'}{'contents'}[0]{'parent'} = $result_trees{'footnote'};
 
-$result_texts{'footnote'} = 'address@hidden footnote.
+$result_texis{'footnote'} = 'address@hidden footnote.
 
 @r{in footnote r}. } after footnote.';
 

Index: t/results/coverage_braces/nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/nested.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage_braces/nested.pl 4 Oct 2010 07:02:41 -0000       1.2
+++ t/results/coverage_braces/nested.pl 17 Oct 2010 09:12:50 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'nested'} = {
   'contents' => [
@@ -64,7 +64,7 @@
 $result_trees{'nested'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested'}{'contents'}[0];
 $result_trees{'nested'}{'contents'}[0]{'parent'} = $result_trees{'nested'};
 
-$result_texts{'nested'} = 'type the characters @kbd{l o g o u t @key{RET}}.';
+$result_texis{'nested'} = 'type the characters @kbd{l o g o u t @key{RET}}.';
 
 $result_errors{'nested'} = [];
 

Index: t/results/coverage_braces/nested_args.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/nested_args.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/coverage_braces/nested_args.pl    13 Oct 2010 23:21:39 -0000      
1.3
+++ t/results/coverage_braces/nested_args.pl    17 Oct 2010 09:12:50 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'nested_args'} = {
   'contents' => [
@@ -96,7 +96,7 @@
 $result_trees{'nested_args'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested_args'}{'contents'}[0];
 $result_trees{'nested_args'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_args'};
 
-$result_texts{'nested_args'} = '@xref{@@ @samp{in samp}, descr @b{in b}}';
+$result_texis{'nested_args'} = '@xref{@@ @samp{in samp}, descr @b{in b}}';
 
 $result_errors{'nested_args'} = [];
 

Index: t/results/coverage_braces/no_brace.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/no_brace.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/coverage_braces/no_brace.pl       4 Oct 2010 22:10:54 -0000       
1.1
+++ t/results/coverage_braces/no_brace.pl       17 Oct 2010 09:12:50 -0000      
1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'no_brace'} = {
   'contents' => [
@@ -34,7 +34,7 @@
 $result_trees{'no_brace'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'no_brace'}{'contents'}[0];
 $result_trees{'no_brace'}{'contents'}[0]{'parent'} = $result_trees{'no_brace'};
 
-$result_texts{'no_brace'} = '@TeX and @code code';
+$result_texis{'no_brace'} = '@TeX and @code code';
 
 $result_errors{'no_brace'} = [
   {

Index: t/results/coverage_braces/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/simple.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage_braces/simple.pl 4 Oct 2010 07:02:41 -0000       1.2
+++ t/results/coverage_braces/simple.pl 17 Oct 2010 09:12:50 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'simple'} = {
   'contents' => [
@@ -38,7 +38,7 @@
 $result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[0];
 $result_trees{'simple'}{'contents'}[0]{'parent'} = $result_trees{'simple'};
 
-$result_texts{'simple'} = '@b{in  b}.';
+$result_texis{'simple'} = '@b{in  b}.';
 
 $result_errors{'simple'} = [];
 

Index: t/results/coverage_braces/too_much_args.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/too_much_args.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/coverage_braces/too_much_args.pl  13 Oct 2010 23:21:39 -0000      
1.3
+++ t/results/coverage_braces/too_much_args.pl  17 Oct 2010 09:12:50 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'too_much_args'} = {
   'contents' => [
@@ -49,7 +49,7 @@
 $result_trees{'too_much_args'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'too_much_args'}{'contents'}[0];
 $result_trees{'too_much_args'}{'contents'}[0]{'parent'} = 
$result_trees{'too_much_args'};
 
-$result_texts{'too_much_args'} = '@abbr{AZE, A truc Z b, E eep}';
+$result_texis{'too_much_args'} = '@abbr{AZE, A truc Z b, E eep}';
 
 $result_errors{'too_much_args'} = [];
 

Index: t/results/itemize/accent_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/itemize/accent_argument.pl        12 Oct 2010 11:33:50 -0000      
1.4
+++ t/results/itemize/accent_argument.pl        17 Oct 2010 09:12:50 -0000      
1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'accent_argument'} = {
   'contents' => [
@@ -166,7 +166,7 @@
 $result_trees{'accent_argument'}{'contents'}[3]{'parent'} = 
$result_trees{'accent_argument'};
 $result_trees{'accent_argument'}{'contents'}[4]{'parent'} = 
$result_trees{'accent_argument'};
 
-$result_texts{'accent_argument'} = '@itemize @address@hidden
+$result_texis{'accent_argument'} = '@itemize @address@hidden
 @item item
 @end itemize
 

Index: t/results/itemize/w_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/w_argument.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/itemize/w_argument.pl     12 Oct 2010 11:33:50 -0000      1.4
+++ t/results/itemize/w_argument.pl     17 Oct 2010 09:12:50 -0000      1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'w_argument'} = {
   'contents' => [
@@ -155,7 +155,7 @@
 $result_trees{'w_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'w_argument'};
 $result_trees{'w_argument'}{'contents'}[1]{'parent'} = 
$result_trees{'w_argument'};
 
-$result_texts{'w_argument'} = '@itemize @w{}
+$result_texis{'w_argument'} = '@itemize @w{}
 @item @option{--build=} platform on which the program is compiled,
 @item @option{--target=} target platform on which the program is processed.
 @end itemize

Index: t/results/macro/arg_body_expansion_order.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/arg_body_expansion_order.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/arg_body_expansion_order.pl 12 Oct 2010 09:59:14 -0000      
1.4
+++ t/results/macro/arg_body_expansion_order.pl 17 Oct 2010 09:12:50 -0000      
1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'arg_body_expansion_order'} = {
   'contents' => [
@@ -206,7 +206,7 @@
 
$result_trees{'arg_body_expansion_order'}{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'arg_body_expansion_order'}{'contents'}[10];
 $result_trees{'arg_body_expansion_order'}{'contents'}[10]{'parent'} = 
$result_trees{'arg_body_expansion_order'};
 
-$result_texts{'arg_body_expansion_order'} = '
+$result_texis{'arg_body_expansion_order'} = '
 @macro othermacro
 initial
 @end macro

Index: t/results/macro/arg_not_closed.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/arg_not_closed.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/arg_not_closed.pl   12 Oct 2010 09:59:14 -0000      1.4
+++ t/results/macro/arg_not_closed.pl   17 Oct 2010 09:12:50 -0000      1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'arg_not_closed'} = {
   'contents' => [
@@ -69,7 +69,7 @@
 $result_trees{'arg_not_closed'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'arg_not_closed'}{'contents'}[3];
 $result_trees{'arg_not_closed'}{'contents'}[3]{'parent'} = 
$result_trees{'arg_not_closed'};
 
-$result_texts{'arg_not_closed'} = '@macro foo {arg}
+$result_texis{'arg_not_closed'} = '@macro foo {arg}
 foo
 @end macro
 

Index: t/results/macro/bad_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/bad_argument.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/bad_argument.pl     12 Oct 2010 09:59:14 -0000      1.4
+++ t/results/macro/bad_argument.pl     17 Oct 2010 09:12:50 -0000      1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'bad_argument'} = {
   'contents' => [
@@ -125,7 +125,7 @@
 $result_trees{'bad_argument'}{'contents'}[6]{'parent'} = 
$result_trees{'bad_argument'};
 $result_trees{'bad_argument'}{'contents'}[7]{'parent'} = 
$result_trees{'bad_argument'};
 
-$result_texts{'bad_argument'} = '@macro
+$result_texis{'bad_argument'} = '@macro
 in macro
 @end macro
 

Index: t/results/macro/bad_formal_arg.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/bad_formal_arg.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/bad_formal_arg.pl   12 Oct 2010 09:59:14 -0000      1.5
+++ t/results/macro/bad_formal_arg.pl   17 Oct 2010 09:12:50 -0000      1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'bad_formal_arg'} = {
   'contents' => [
@@ -200,7 +200,7 @@
 $result_trees{'bad_formal_arg'}{'contents'}[7]{'parent'} = 
$result_trees{'bad_formal_arg'};
 $result_trees{'bad_formal_arg'}{'contents'}[8]{'parent'} = 
$result_trees{'bad_formal_arg'};
 
-$result_texts{'bad_formal_arg'} = '
+$result_texis{'bad_formal_arg'} = '
 @macro bad  { , not_empty}
 in bad macro
 @end macro

Index: t/results/macro/complete_macro_for_end.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/complete_macro_for_end.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/macro/complete_macro_for_end.pl   12 Oct 2010 18:06:18 -0000      
1.1
+++ t/results/macro/complete_macro_for_end.pl   17 Oct 2010 09:12:50 -0000      
1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'complete_macro_for_end'} = {
   'contents' => [
@@ -67,7 +67,7 @@
 $result_trees{'complete_macro_for_end'}{'contents'}[3]{'parent'} = 
$result_trees{'complete_macro_for_end'};
 $result_trees{'complete_macro_for_end'}{'contents'}[4]{'parent'} = 
$result_trees{'complete_macro_for_end'};
 
-$result_texts{'complete_macro_for_end'} = '@macro the-end
+$result_texis{'complete_macro_for_end'} = '@macro the-end
 @end cartouche
 @end macro
 

Index: t/results/macro/complex_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/complex_argument.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/macro/complex_argument.pl 12 Oct 2010 16:45:07 -0000      1.6
+++ t/results/macro/complex_argument.pl 17 Oct 2010 09:12:50 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'complex_argument'} = {
   'contents' => [
@@ -542,7 +542,7 @@
 $result_trees{'complex_argument'}{'contents'}[20]{'parent'} = 
$result_trees{'complex_argument'};
 $result_trees{'complex_argument'}{'contents'}[21]{'parent'} = 
$result_trees{'complex_argument'};
 
-$result_texts{'complex_argument'} = '@macro macro2{arg}
+$result_texis{'complex_argument'} = '@macro macro2{arg}
 coucou \\arg\\ after arg
 @end macro
 

Index: t/results/macro/empty_end.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/empty_end.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/empty_end.pl        12 Oct 2010 09:59:14 -0000      1.3
+++ t/results/macro/empty_end.pl        17 Oct 2010 09:12:50 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'empty_end'} = {
   'contents' => [
@@ -48,7 +48,7 @@
 $result_trees{'empty_end'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_end'};
 $result_trees{'empty_end'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_end'};
 
-$result_texts{'empty_end'} = '@macro foo {aaa, }
+$result_texis{'empty_end'} = '@macro foo {aaa, }
 in foo
 @end macro';
 

Index: t/results/macro/expand_two_same.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/expand_two_same.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/expand_two_same.pl  13 Oct 2010 23:21:39 -0000      1.5
+++ t/results/macro/expand_two_same.pl  17 Oct 2010 09:12:50 -0000      1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'expand_two_same'} = {
   'contents' => [
@@ -184,7 +184,7 @@
 $result_trees{'expand_two_same'}{'contents'}[5]{'parent'} = 
$result_trees{'expand_two_same'};
 $result_trees{'expand_two_same'}{'contents'}[6]{'parent'} = 
$result_trees{'expand_two_same'};
 
-$result_texts{'expand_two_same'} = '@macro macro2 { arg }
+$result_texis{'expand_two_same'} = '@macro macro2 { arg }
 With a doubles arg \\arg\\ and re \\arg\\
 
 @end macro

Index: t/results/macro/expansion_order.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/expansion_order.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/expansion_order.pl  12 Oct 2010 09:59:14 -0000      1.3
+++ t/results/macro/expansion_order.pl  17 Oct 2010 09:12:50 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'expansion_order'} = {
   'contents' => [
@@ -126,7 +126,7 @@
 $result_trees{'expansion_order'}{'contents'}[6]{'parent'} = 
$result_trees{'expansion_order'};
 $result_trees{'expansion_order'}{'contents'}[7]{'parent'} = 
$result_trees{'expansion_order'};
 
-$result_texts{'expansion_order'} = '@macro bidule{arg}
+$result_texis{'expansion_order'} = '@macro bidule{arg}
 @machin{}
 @end macro
 

Index: t/results/macro/ifclear_in_macro.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/ifclear_in_macro.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/ifclear_in_macro.pl 12 Oct 2010 09:59:14 -0000      1.3
+++ t/results/macro/ifclear_in_macro.pl 17 Oct 2010 09:12:50 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'ifclear_in_macro'} = {
   'contents' => [
@@ -92,7 +92,7 @@
 $result_trees{'ifclear_in_macro'}{'contents'}[3]{'parent'} = 
$result_trees{'ifclear_in_macro'};
 $result_trees{'ifclear_in_macro'}{'contents'}[4]{'parent'} = 
$result_trees{'ifclear_in_macro'};
 
-$result_texts{'ifclear_in_macro'} = '@macro note {arg}
+$result_texis{'ifclear_in_macro'} = '@macro note {arg}
 @ifclear notes 
 \\arg\\
 @end ifclear

Index: t/results/macro/ifset_in_macro.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/ifset_in_macro.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/ifset_in_macro.pl   12 Oct 2010 09:59:14 -0000      1.3
+++ t/results/macro/ifset_in_macro.pl   17 Oct 2010 09:12:50 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'ifset_in_macro'} = {
   'contents' => [
@@ -72,7 +72,7 @@
 $result_trees{'ifset_in_macro'}{'contents'}[1]{'parent'} = 
$result_trees{'ifset_in_macro'};
 $result_trees{'ifset_in_macro'}{'contents'}[2]{'parent'} = 
$result_trees{'ifset_in_macro'};
 
-$result_texts{'ifset_in_macro'} = '@macro note {arg}
+$result_texis{'ifset_in_macro'} = '@macro note {arg}
 @ifset notes 
 \\arg\\
 @end ifset

Index: t/results/macro/ifset_in_macro_set.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/ifset_in_macro_set.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/ifset_in_macro_set.pl       12 Oct 2010 09:59:14 -0000      
1.3
+++ t/results/macro/ifset_in_macro_set.pl       17 Oct 2010 09:12:50 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'ifset_in_macro_set'} = {
   'contents' => [
@@ -92,7 +92,7 @@
 $result_trees{'ifset_in_macro_set'}{'contents'}[3]{'parent'} = 
$result_trees{'ifset_in_macro_set'};
 $result_trees{'ifset_in_macro_set'}{'contents'}[4]{'parent'} = 
$result_trees{'ifset_in_macro_set'};
 
-$result_texts{'ifset_in_macro_set'} = '@macro note {arg}
+$result_texis{'ifset_in_macro_set'} = '@macro note {arg}
 @ifset notes 
 \\arg\\
 @end ifset

Index: t/results/macro/implicit_quoting_one_arg.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/implicit_quoting_one_arg.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/implicit_quoting_one_arg.pl 12 Oct 2010 09:59:14 -0000      
1.5
+++ t/results/macro/implicit_quoting_one_arg.pl 17 Oct 2010 09:12:50 -0000      
1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'implicit_quoting_one_arg'} = {
   'contents' => [
@@ -97,7 +97,7 @@
 
$result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'implicit_quoting_one_arg'}{'contents'}[4];
 $result_trees{'implicit_quoting_one_arg'}{'contents'}[4]{'parent'} = 
$result_trees{'implicit_quoting_one_arg'};
 
-$result_texts{'implicit_quoting_one_arg'} = '
+$result_texis{'implicit_quoting_one_arg'} = '
 @macro FIXME{a}
 @strong{FIXME: \\a\\}
 @end macro

Index: t/results/macro/implicit_quoting_recursion.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/implicit_quoting_recursion.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/implicit_quoting_recursion.pl       12 Oct 2010 09:59:14 
-0000      1.3
+++ t/results/macro/implicit_quoting_recursion.pl       17 Oct 2010 09:12:50 
-0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'implicit_quoting_recursion'} = {
   'contents' => [
@@ -76,7 +76,7 @@
 
$result_trees{'implicit_quoting_recursion'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'implicit_quoting_recursion'}{'contents'}[3];
 $result_trees{'implicit_quoting_recursion'}{'contents'}[3]{'parent'} = 
$result_trees{'implicit_quoting_recursion'};
 
-$result_texts{'implicit_quoting_recursion'} = '@rmacro cat{a,b}
+$result_texis{'implicit_quoting_recursion'} = '@rmacro cat{a,b}
 \\a\\\\b\\
 @end rmacro
 

Index: t/results/macro/macro_expansion.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_expansion.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/macro/macro_expansion.pl  12 Oct 2010 11:33:50 -0000      1.8
+++ t/results/macro/macro_expansion.pl  17 Oct 2010 09:12:50 -0000      1.9
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_expansion'} = {
   'contents' => [
@@ -476,7 +476,7 @@
 $result_trees{'macro_expansion'}{'contents'}[29]{'contents'}[0]{'parent'} = 
$result_trees{'macro_expansion'}{'contents'}[29];
 $result_trees{'macro_expansion'}{'contents'}[29]{'parent'} = 
$result_trees{'macro_expansion'};
 
-$result_texts{'macro_expansion'} = '
+$result_texis{'macro_expansion'} = '
 @macro macro1 {arg1, arg2 }
 result of a macro with \\arg1\\ and 
 @verbatim

Index: t/results/macro/macro_for_end.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_for_end.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/macro_for_end.pl    12 Oct 2010 11:33:50 -0000      1.3
+++ t/results/macro/macro_for_end.pl    17 Oct 2010 09:12:50 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_for_end'} = {
   'contents' => [
@@ -80,7 +80,7 @@
 $result_trees{'macro_for_end'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'macro_for_end'}{'contents'}[3];
 $result_trees{'macro_for_end'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_for_end'};
 
-$result_texts{'macro_for_end'} = '@macro my-end
+$result_texis{'macro_for_end'} = '@macro my-end
 @end
 @end macro
 

Index: t/results/macro/macro_in_accent.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_accent.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/macro/macro_in_accent.pl  12 Oct 2010 18:06:18 -0000      1.1
+++ t/results/macro/macro_in_accent.pl  17 Oct 2010 09:12:50 -0000      1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_accent'} = {
   'contents' => [
@@ -218,7 +218,7 @@
 $result_trees{'macro_in_accent'}{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[8];
 $result_trees{'macro_in_accent'}{'contents'}[8]{'parent'} = 
$result_trees{'macro_in_accent'};
 
-$result_texts{'macro_in_accent'} = '@macro a-letter
+$result_texis{'macro_in_accent'} = '@macro a-letter
 a
 @end macro
 

Index: t/results/macro/macro_in_brace_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_brace_command.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/macro_in_brace_command.pl   12 Oct 2010 11:33:50 -0000      
1.5
+++ t/results/macro/macro_in_brace_command.pl   17 Oct 2010 09:12:51 -0000      
1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_brace_command'} = {
   'contents' => [
@@ -199,7 +199,7 @@
 $result_trees{'macro_in_brace_command'}{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_brace_command'};
 $result_trees{'macro_in_brace_command'}{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_brace_command'};
 
-$result_texts{'macro_in_brace_command'} = '@macro foo
+$result_texis{'macro_in_brace_command'} = '@macro foo
 foo-expansion
 @end macro
 

Index: t/results/macro/macro_in_end_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_end_argument.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/macro_in_end_argument.pl    12 Oct 2010 11:33:50 -0000      
1.3
+++ t/results/macro/macro_in_end_argument.pl    17 Oct 2010 09:12:51 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_end_argument'} = {
   'contents' => [
@@ -80,7 +80,7 @@
 $result_trees{'macro_in_end_argument'}{'contents'}[3]{'contents'}[2]{'parent'} 
= $result_trees{'macro_in_end_argument'}{'contents'}[3];
 $result_trees{'macro_in_end_argument'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_end_argument'};
 
-$result_texts{'macro_in_end_argument'} = '@macro a-cartouche
+$result_texis{'macro_in_end_argument'} = '@macro a-cartouche
 cartouche
 @end macro
 

Index: t/results/macro/macro_in_ifset.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_ifset.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/macro_in_ifset.pl   12 Oct 2010 09:59:14 -0000      1.3
+++ t/results/macro/macro_in_ifset.pl   17 Oct 2010 09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_ifset'} = {
   'contents' => [
@@ -56,7 +56,7 @@
 $result_trees{'macro_in_ifset'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_ifset'};
 $result_trees{'macro_in_ifset'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_ifset'};
 
-$result_texts{'macro_in_ifset'} = '@macro macro1 {arg}
+$result_texis{'macro_in_ifset'} = '@macro macro1 {arg}
 @end ifset
 @end macro
 

Index: t/results/macro/macro_in_ifset_end_in_arg.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/macro_in_ifset_end_in_arg.pl        12 Oct 2010 09:59:14 
-0000      1.5
+++ t/results/macro/macro_in_ifset_end_in_arg.pl        17 Oct 2010 09:12:51 
-0000      1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_ifset_end_in_arg'} = {
   'contents' => [
@@ -76,7 +76,7 @@
 
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[4];
 $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_ifset_end_in_arg'};
 
-$result_texts{'macro_in_ifset_end_in_arg'} = '@macro macro1 {arg}
+$result_texis{'macro_in_ifset_end_in_arg'} = '@macro macro1 {arg}
 @end ifset
 @end macro
 

Index: t/results/macro/macro_in_index_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/macro/macro_in_index_commands.pl  16 Oct 2010 13:41:22 -0000      
1.1
+++ t/results/macro/macro_in_index_commands.pl  17 Oct 2010 09:12:51 -0000      
1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_index_commands'} = {
   'contents' => [
@@ -1559,7 +1559,7 @@
 $result_trees{'macro_in_index_commands'}{'contents'}[83]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_index_commands'}{'contents'}[83];
 $result_trees{'macro_in_index_commands'}{'contents'}[83]{'parent'} = 
$result_trees{'macro_in_index_commands'};
 
-$result_texts{'macro_in_index_commands'} = '@macro cp
+$result_texis{'macro_in_index_commands'} = '@macro cp
 cp
 @end macro
 @macro fn 

Index: t/results/macro/macro_in_macro_arg.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/macro_in_macro_arg.pl       12 Oct 2010 09:59:14 -0000      
1.5
+++ t/results/macro/macro_in_macro_arg.pl       17 Oct 2010 09:12:51 -0000      
1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_macro_arg'} = {
   'contents' => [
@@ -190,7 +190,7 @@
 $result_trees{'macro_in_macro_arg'}{'contents'}[10]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_macro_arg'}{'contents'}[10];
 $result_trees{'macro_in_macro_arg'}{'contents'}[10]{'parent'} = 
$result_trees{'macro_in_macro_arg'};
 
-$result_texts{'macro_in_macro_arg'} = '
+$result_texis{'macro_in_macro_arg'} = '
 @macro macro1
 a, @macro2
 @end macro

Index: t/results/macro/macro_in_macro_arg_simpler.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg_simpler.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/macro_in_macro_arg_simpler.pl       12 Oct 2010 09:59:14 
-0000      1.3
+++ t/results/macro/macro_in_macro_arg_simpler.pl       17 Oct 2010 09:12:51 
-0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_macro_arg_simpler'} = {
   'contents' => [
@@ -132,7 +132,7 @@
 
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6];
 $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_macro_arg_simpler'};
 
-$result_texts{'macro_in_macro_arg_simpler'} = '@macro macro11
+$result_texis{'macro_in_macro_arg_simpler'} = '@macro macro11
 a, macro2
 @end macro
 

Index: t/results/macro/macro_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_menu.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/macro/macro_in_menu.pl    12 Oct 2010 09:59:14 -0000      1.6
+++ t/results/macro/macro_in_menu.pl    17 Oct 2010 09:12:51 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_menu'} = {
   'contents' => [
@@ -543,7 +543,7 @@
 $result_trees{'macro_in_menu'}{'contents'}[19]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[20]{'parent'} = 
$result_trees{'macro_in_menu'};
 
-$result_texts{'macro_in_menu'} = '
+$result_texis{'macro_in_menu'} = '
 @macro star
 *
 @end macro

Index: t/results/macro/macro_in_misc_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/macro/macro_in_misc_commands.pl   16 Oct 2010 19:57:50 -0000      
1.2
+++ t/results/macro/macro_in_misc_commands.pl   17 Oct 2010 09:12:51 -0000      
1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_misc_commands'} = {
   'contents' => [
@@ -3157,7 +3157,7 @@
 $result_trees{'macro_in_misc_commands'}{'contents'}[191]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[192]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 
-$result_texts{'macro_in_misc_commands'} = '@macro text 
+$result_texis{'macro_in_misc_commands'} = '@macro text 
 atext
 @end macro
 

Index: t/results/macro/macro_no_arg_bad_expansion.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_no_arg_bad_expansion.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/macro_no_arg_bad_expansion.pl       12 Oct 2010 09:59:14 
-0000      1.3
+++ t/results/macro/macro_no_arg_bad_expansion.pl       17 Oct 2010 09:12:51 
-0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_no_arg_bad_expansion'} = {
   'contents' => [
@@ -60,7 +60,7 @@
 
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3];
 $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_no_arg_bad_expansion'};
 
-$result_texts{'macro_no_arg_bad_expansion'} = '@macro test1
+$result_texis{'macro_no_arg_bad_expansion'} = '@macro test1
 res1
 @end macro
 

Index: t/results/macro/macro_no_arg_expansion.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_no_arg_expansion.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/macro_no_arg_expansion.pl   12 Oct 2010 09:59:14 -0000      
1.3
+++ t/results/macro/macro_no_arg_expansion.pl   17 Oct 2010 09:12:51 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_no_arg_expansion'} = {
   'contents' => [
@@ -60,7 +60,7 @@
 
$result_trees{'macro_no_arg_expansion'}{'contents'}[3]{'contents'}[0]{'parent'} 
= $result_trees{'macro_no_arg_expansion'}{'contents'}[3];
 $result_trees{'macro_no_arg_expansion'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_no_arg_expansion'};
 
-$result_texts{'macro_no_arg_expansion'} = '@macro test1
+$result_texis{'macro_no_arg_expansion'} = '@macro test1
 res1
 @end macro
 

Index: t/results/macro/macro_no_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_no_argument.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/macro/macro_no_argument.pl        16 Oct 2010 11:28:38 -0000      
1.1
+++ t/results/macro/macro_no_argument.pl        17 Oct 2010 09:12:51 -0000      
1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_no_argument'} = {
   'contents' => [
@@ -14,7 +14,7 @@
 };
 $result_trees{'macro_no_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_no_argument'};
 
-$result_texts{'macro_no_argument'} = '@address@hidden macro';
+$result_texis{'macro_no_argument'} = '@address@hidden macro';
 
 $result_errors{'macro_no_argument'} = [
   {

Index: t/results/macro/macro_not_closed.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_not_closed.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/macro/macro_not_closed.pl 16 Oct 2010 11:28:38 -0000      1.1
+++ t/results/macro/macro_not_closed.pl 17 Oct 2010 09:12:51 -0000      1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_not_closed'} = {
   'contents' => [
@@ -31,7 +31,7 @@
 $result_trees{'macro_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'macro_not_closed'}{'contents'}[0];
 $result_trees{'macro_not_closed'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_not_closed'};
 
-$result_texts{'macro_not_closed'} = '@macro name
+$result_texis{'macro_not_closed'} = '@macro name
 in macro
 @end macro';
 

Index: t/results/macro/macro_one_arg_end_of_file.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_one_arg_end_of_file.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/macro/macro_one_arg_end_of_file.pl        16 Oct 2010 11:28:38 
-0000      1.1
+++ t/results/macro/macro_one_arg_end_of_file.pl        17 Oct 2010 09:12:51 
-0000      1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_one_arg_end_of_file'} = {
   'contents' => [
@@ -68,7 +68,7 @@
 
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_one_arg_end_of_file'}{'contents'}[3];
 $result_trees{'macro_one_arg_end_of_file'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_one_arg_end_of_file'};
 
-$result_texts{'macro_one_arg_end_of_file'} = '@macro one-arg{arg}
+$result_texis{'macro_one_arg_end_of_file'} = '@macro one-arg{arg}
 Arg \\arg\\.
 @end macro
 

Index: t/results/macro/macro_zero.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_zero.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/macro_zero.pl       12 Oct 2010 09:59:14 -0000      1.4
+++ t/results/macro/macro_zero.pl       17 Oct 2010 09:12:51 -0000      1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_zero'} = {
   'contents' => [
@@ -66,7 +66,7 @@
 $result_trees{'macro_zero'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'macro_zero'}{'contents'}[3];
 $result_trees{'macro_zero'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_zero'};
 
-$result_texts{'macro_zero'} = '@macro zero
+$result_texis{'macro_zero'} = '@macro zero
 0
 @end macro
 

Index: t/results/macro/nested_macro_call.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/nested_macro_call.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/nested_macro_call.pl        12 Oct 2010 09:59:14 -0000      
1.4
+++ t/results/macro/nested_macro_call.pl        17 Oct 2010 09:12:51 -0000      
1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'nested_macro_call'} = {
   'contents' => [
@@ -116,7 +116,7 @@
 $result_trees{'nested_macro_call'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'nested_macro_call'}{'contents'}[6];
 $result_trees{'nested_macro_call'}{'contents'}[6]{'parent'} = 
$result_trees{'nested_macro_call'};
 
-$result_texts{'nested_macro_call'} = '@macro machin{}
+$result_texis{'nested_macro_call'} = '@macro machin{}
 (machin)
 @end macro
 

Index: t/results/macro/no_macrobody.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/no_macrobody.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/macro/no_macrobody.pl     12 Oct 2010 09:59:14 -0000      1.6
+++ t/results/macro/no_macrobody.pl     17 Oct 2010 09:12:51 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'no_macrobody'} = {
   'contents' => [
@@ -74,7 +74,7 @@
 $result_trees{'no_macrobody'}{'contents'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'no_macrobody'}{'contents'}[5];
 $result_trees{'no_macrobody'}{'contents'}[5]{'parent'} = 
$result_trees{'no_macrobody'};
 
-$result_texts{'no_macrobody'} = '@macro no-macrobody {arg}
+$result_texis{'no_macrobody'} = '@macro no-macrobody {arg}
 @end macro
 
 

Index: t/results/macro/paragraph_and_macro.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/paragraph_and_macro.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/paragraph_and_macro.pl      12 Oct 2010 09:59:14 -0000      
1.4
+++ t/results/macro/paragraph_and_macro.pl      17 Oct 2010 09:12:51 -0000      
1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'paragraph_and_macro'} = {
   'contents' => [
@@ -221,7 +221,7 @@
 $result_trees{'paragraph_and_macro'}{'contents'}[21]{'contents'}[0]{'parent'} 
= $result_trees{'paragraph_and_macro'}{'contents'}[21];
 $result_trees{'paragraph_and_macro'}{'contents'}[21]{'parent'} = 
$result_trees{'paragraph_and_macro'};
 
-$result_texts{'paragraph_and_macro'} = '@macro empty
+$result_texis{'paragraph_and_macro'} = '@macro empty
 @end macro
 
 @macro space

Index: t/results/macro/protect_comma_macro_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/protect_comma_macro_line.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/protect_comma_macro_line.pl 12 Oct 2010 09:59:14 -0000      
1.3
+++ t/results/macro/protect_comma_macro_line.pl 17 Oct 2010 09:12:51 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'protect_comma_macro_line'} = {
   'contents' => [
@@ -119,7 +119,7 @@
 
$result_trees{'protect_comma_macro_line'}{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'protect_comma_macro_line'}{'contents'}[5];
 $result_trees{'protect_comma_macro_line'}{'contents'}[5]{'parent'} = 
$result_trees{'protect_comma_macro_line'};
 
-$result_texts{'protect_comma_macro_line'} = '@macro macro2 { arg }
+$result_texis{'protect_comma_macro_line'} = '@macro macro2 { arg }
 we get \\arg\\ and another \\arg\\
 and another one on another line \\arg\\
 

Index: t/results/macro/protect_in_body.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/protect_in_body.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/protect_in_body.pl  12 Oct 2010 09:59:14 -0000      1.4
+++ t/results/macro/protect_in_body.pl  17 Oct 2010 09:12:51 -0000      1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'protect_in_body'} = {
   'contents' => [
@@ -144,7 +144,7 @@
 $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'};
 
-$result_texts{'protect_in_body'} = '@macro macro1 { arg1 , arg2 }
+$result_texis{'protect_in_body'} = '@macro macro1 { arg1 , arg2 }
 result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}
 @end macro
 

Index: t/results/macro/protect_in_body_line_arg.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/protect_in_body_line_arg.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/protect_in_body_line_arg.pl 12 Oct 2010 09:59:14 -0000      
1.4
+++ t/results/macro/protect_in_body_line_arg.pl 17 Oct 2010 09:12:51 -0000      
1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'protect_in_body_line_arg'} = {
   'contents' => [
@@ -142,7 +142,7 @@
 
$result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[6]{'parent'}
 = $result_trees{'protect_in_body_line_arg'}{'contents'}[3];
 $result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'protect_in_body_line_arg'};
 
-$result_texts{'protect_in_body_line_arg'} = '@macro macro1 { arg1 , arg2 }
+$result_texis{'protect_in_body_line_arg'} = '@macro macro1 { arg1 , arg2 }
 result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}
 @end macro
 

Index: t/results/macro/protect_in_body_one_arg.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/protect_in_body_one_arg.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/protect_in_body_one_arg.pl  12 Oct 2010 09:59:14 -0000      
1.5
+++ t/results/macro/protect_in_body_one_arg.pl  17 Oct 2010 09:12:51 -0000      
1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'protect_in_body_one_arg'} = {
   'contents' => [
@@ -138,7 +138,7 @@
 
$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'};
 
-$result_texts{'protect_in_body_one_arg'} = '@macro macro1 { arg1 , arg2 }
+$result_texis{'protect_in_body_one_arg'} = '@macro macro1 { arg1 , arg2 }
 result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}
 @end macro
 

Index: t/results/macro/space_macro_after_end.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/space_macro_after_end.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/macro/space_macro_after_end.pl    12 Oct 2010 18:06:18 -0000      
1.1
+++ t/results/macro/space_macro_after_end.pl    17 Oct 2010 09:12:51 -0000      
1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'space_macro_after_end'} = {
   'contents' => [
@@ -74,7 +74,7 @@
 $result_trees{'space_macro_after_end'}{'contents'}[3]{'parent'} = 
$result_trees{'space_macro_after_end'};
 $result_trees{'space_macro_after_end'}{'contents'}[4]{'parent'} = 
$result_trees{'space_macro_after_end'};
 
-$result_texts{'space_macro_after_end'} = '@macro spaces
+$result_texis{'space_macro_after_end'} = '@macro spaces
   
 @end macro
 

Index: t/results/macro/text_before_after.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/text_before_after.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/text_before_after.pl        12 Oct 2010 11:33:50 -0000      
1.3
+++ t/results/macro/text_before_after.pl        17 Oct 2010 09:12:51 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'text_before_after'} = {
   'contents' => [
@@ -57,7 +57,7 @@
 $result_trees{'text_before_after'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'text_before_after'}{'contents'}[0];
 $result_trees{'text_before_after'}{'contents'}[0]{'parent'} = 
$result_trees{'text_before_after'};
 
-$result_texts{'text_before_after'} = 'before @macro mymacro
+$result_texis{'text_before_after'} = 'before @macro mymacro
 in macro
 @end macro after
 ';

Index: t/results/macro/too_much_args.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/too_much_args.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/too_much_args.pl    12 Oct 2010 09:59:15 -0000      1.4
+++ t/results/macro/too_much_args.pl    17 Oct 2010 09:12:51 -0000      1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'too_much_args'} = {
   'contents' => [
@@ -90,7 +90,7 @@
 $result_trees{'too_much_args'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'too_much_args'}{'contents'}[3];
 $result_trees{'too_much_args'}{'contents'}[3]{'parent'} = 
$result_trees{'too_much_args'};
 
-$result_texts{'too_much_args'} = '@macro twoargs {first, second}
+$result_texis{'too_much_args'} = '@macro twoargs {first, second}
 first arg: \\first\\
 second arg: \\second\\
 @end macro

Index: t/results/macro/two_macros_on_a_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/two_macros_on_a_line.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/two_macros_on_a_line.pl     12 Oct 2010 09:59:15 -0000      
1.5
+++ t/results/macro/two_macros_on_a_line.pl     17 Oct 2010 09:12:51 -0000      
1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'two_macros_on_a_line'} = {
   'contents' => [
@@ -361,7 +361,7 @@
 $result_trees{'two_macros_on_a_line'}{'contents'}[15]{'contents'}[1]{'parent'} 
= $result_trees{'two_macros_on_a_line'}{'contents'}[15];
 $result_trees{'two_macros_on_a_line'}{'contents'}[15]{'parent'} = 
$result_trees{'two_macros_on_a_line'};
 
-$result_texts{'two_macros_on_a_line'} = '@macro mymacro
+$result_texis{'two_macros_on_a_line'} = '@macro mymacro
 in mymacro
 @end macro
 

Index: t/results/macro/zero_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/zero_argument.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/zero_argument.pl    12 Oct 2010 09:59:15 -0000      1.3
+++ t/results/macro/zero_argument.pl    17 Oct 2010 09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'zero_argument'} = {
   'contents' => [
@@ -81,7 +81,7 @@
 $result_trees{'zero_argument'}{'contents'}[3]{'parent'} = 
$result_trees{'zero_argument'};
 $result_trees{'zero_argument'}{'contents'}[4]{'parent'} = 
$result_trees{'zero_argument'};
 
-$result_texts{'zero_argument'} = '@macro foo {}
+$result_texis{'zero_argument'} = '@macro foo {}
 in foo
 @end macro
 

Index: t/results/menu/bad_beginning.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/bad_beginning.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/menu/bad_beginning.pl     12 Oct 2010 09:59:15 -0000      1.2
+++ t/results/menu/bad_beginning.pl     17 Oct 2010 09:12:51 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'bad_beginning'} = {
   'contents' => [
@@ -78,7 +78,7 @@
 $result_trees{'bad_beginning'}{'contents'}[0]{'parent'} = 
$result_trees{'bad_beginning'};
 $result_trees{'bad_beginning'}{'contents'}[1]{'parent'} = 
$result_trees{'bad_beginning'};
 
-$result_texts{'bad_beginning'} = '@menu
+$result_texis{'bad_beginning'} = '@menu
 *   
 *
 *something::

Index: t/results/menu/detailmenu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/menu/detailmenu.pl        16 Oct 2010 10:11:49 -0000      1.2
+++ t/results/menu/detailmenu.pl        17 Oct 2010 09:12:51 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'detailmenu'} = {
   'contents' => [
@@ -149,7 +149,7 @@
 $result_trees{'detailmenu'}{'contents'}[1]{'parent'} = 
$result_trees{'detailmenu'};
 $result_trees{'detailmenu'}{'contents'}[2]{'parent'} = 
$result_trees{'detailmenu'};
 
-$result_texts{'detailmenu'} = '
+$result_texis{'detailmenu'} = '
 @menu
 * Copying Conditions::          Your rights.
 

Index: t/results/menu/menu_entry_name.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_entry_name.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/menu/menu_entry_name.pl   12 Oct 2010 09:59:15 -0000      1.3
+++ t/results/menu/menu_entry_name.pl   17 Oct 2010 09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'menu_entry_name'} = {
   'contents' => [
@@ -634,7 +634,7 @@
 $result_trees{'menu_entry_name'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_name'};
 $result_trees{'menu_entry_name'}{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_name'};
 
-$result_texts{'menu_entry_name'} = '@menu
+$result_texis{'menu_entry_name'} = '@menu
 * a: (f)b
 * a: (f)b1.c,
 * a: (f)b2.c,     

Index: t/results/menu/menu_entry_name_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_entry_name_comment.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/menu/menu_entry_name_comment.pl   12 Oct 2010 09:59:15 -0000      
1.2
+++ t/results/menu/menu_entry_name_comment.pl   17 Oct 2010 09:12:51 -0000      
1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'menu_entry_name_comment'} = {
   'contents' => [
@@ -369,7 +369,7 @@
 $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_name_comment'};
 $result_trees{'menu_entry_name_comment'}{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_name_comment'};
 
-$result_texts{'menu_entry_name_comment'} = '@menu
+$result_texis{'menu_entry_name_comment'} = '@menu
 * a: (f)address@hidden c
 * a: (f)b @c c
 * a: (f)b1c.c,@c c

Index: t/results/menu/menu_entry_no_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/menu/menu_entry_no_entry.pl       12 Oct 2010 09:59:15 -0000      
1.3
+++ t/results/menu/menu_entry_no_entry.pl       17 Oct 2010 09:12:51 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'menu_entry_no_entry'} = {
   'contents' => [
@@ -160,7 +160,7 @@
 $result_trees{'menu_entry_no_entry'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_no_entry'};
 $result_trees{'menu_entry_no_entry'}{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_no_entry'};
 
-$result_texts{'menu_entry_no_entry'} = '@menu
+$result_texis{'menu_entry_no_entry'} = '@menu
 * a1:
 * a2:  
 * a1c:@c c

Index: t/results/menu/menu_entry_node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_entry_node.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/menu/menu_entry_node.pl   12 Oct 2010 09:59:15 -0000      1.3
+++ t/results/menu/menu_entry_node.pl   17 Oct 2010 09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'menu_entry_node'} = {
   'contents' => [
@@ -217,7 +217,7 @@
 $result_trees{'menu_entry_node'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_node'};
 $result_trees{'menu_entry_node'}{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_node'};
 
-$result_texts{'menu_entry_node'} = '@menu
+$result_texis{'menu_entry_node'} = '@menu
 * (f)a1::
 * (f)a2::  
 * (f)a3::         d

Index: t/results/menu/menu_entry_node_comments.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_entry_node_comments.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/menu/menu_entry_node_comments.pl  12 Oct 2010 09:59:15 -0000      
1.2
+++ t/results/menu/menu_entry_node_comments.pl  17 Oct 2010 09:12:51 -0000      
1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'menu_entry_node_comments'} = {
   'contents' => [
@@ -239,7 +239,7 @@
 $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_node_comments'};
 $result_trees{'menu_entry_node_comments'}{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_node_comments'};
 
-$result_texts{'menu_entry_node_comments'} = '@menu
+$result_texis{'menu_entry_node_comments'} = '@menu
 * (f)a1c::@c c
 * (f)a2c::  @c c
 * (f)a3c::         address@hidden c

Index: t/results/menu/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/menu/simple.pl    12 Oct 2010 09:59:15 -0000      1.4
+++ t/results/menu/simple.pl    17 Oct 2010 09:12:51 -0000      1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'simple'} = {
   'contents' => [
@@ -334,7 +334,7 @@
 $result_trees{'simple'}{'contents'}[1]{'parent'} = $result_trees{'simple'};
 $result_trees{'simple'}{'contents'}[2]{'parent'} = $result_trees{'simple'};
 
-$result_texts{'simple'} = '
+$result_texis{'simple'} = '
 @menu
 comment
 * menu entry name : node.    description

Index: t/results/misc_commands/also_not_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/also_not_line.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/misc_commands/also_not_line.pl    12 Oct 2010 16:45:08 -0000      
1.5
+++ t/results/misc_commands/also_not_line.pl    17 Oct 2010 09:12:51 -0000      
1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'also_not_line'} = {
   'contents' => [
@@ -360,7 +360,7 @@
 $result_trees{'also_not_line'}{'contents'}[21]{'contents'}[3]{'parent'} = 
$result_trees{'also_not_line'}{'contents'}[21];
 $result_trees{'also_not_line'}{'contents'}[21]{'parent'} = 
$result_trees{'also_not_line'};
 
-$result_texts{'also_not_line'} = '
+$result_texis{'also_not_line'} = '
 
 page @page
 noindent @noindent refill @refill something

Index: t/results/misc_commands/bad.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/bad.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/misc_commands/bad.pl      12 Oct 2010 16:45:08 -0000      1.3
+++ t/results/misc_commands/bad.pl      17 Oct 2010 09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'bad'} = {
   'contents' => [
@@ -43,7 +43,7 @@
 $result_trees{'bad'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'bad'}{'contents'}[0];
 $result_trees{'bad'}{'contents'}[0]{'parent'} = $result_trees{'bad'};
 
-$result_texts{'bad'} = 'kbdinputstyle @kbdinputstyle wrong arg on line 
following kbdinputstyle
+$result_texis{'bad'} = 'kbdinputstyle @kbdinputstyle wrong arg on line 
following kbdinputstyle
 ';
 
 $result_errors{'bad'} = [

Index: t/results/misc_commands/clickstyle.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/clickstyle.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/misc_commands/clickstyle.pl       12 Oct 2010 09:59:15 -0000      
1.5
+++ t/results/misc_commands/clickstyle.pl       17 Oct 2010 09:12:51 -0000      
1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'clickstyle'} = {
   'contents' => [
@@ -62,7 +62,7 @@
 $result_trees{'clickstyle'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'clickstyle'}{'contents'}[2];
 $result_trees{'clickstyle'}{'contents'}[2]{'parent'} = 
$result_trees{'clickstyle'};
 
-$result_texts{'clickstyle'} = '@clickstyle @result
+$result_texis{'clickstyle'} = '@clickstyle @result
 
 A @click{} (result).
 ';

Index: t/results/misc_commands/command_line_in_paragraph.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/command_line_in_paragraph.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/misc_commands/command_line_in_paragraph.pl        12 Oct 2010 
16:45:08 -0000      1.3
+++ t/results/misc_commands/command_line_in_paragraph.pl        17 Oct 2010 
09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'command_line_in_paragraph'} = {
   'contents' => [
@@ -50,7 +50,7 @@
 
$result_trees{'command_line_in_paragraph'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'command_line_in_paragraph'}{'contents'}[0];
 $result_trees{'command_line_in_paragraph'}{'contents'}[0]{'parent'} = 
$result_trees{'command_line_in_paragraph'};
 
-$result_texts{'command_line_in_paragraph'} = 'documentlanguage on its line
+$result_texis{'command_line_in_paragraph'} = 'documentlanguage on its line
 @documentlanguage  en  
 line following documentlanguage
 ';

Index: t/results/misc_commands/contents.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/contents.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/misc_commands/contents.pl 9 Oct 2010 17:51:37 -0000       1.2
+++ t/results/misc_commands/contents.pl 17 Oct 2010 09:12:51 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'contents'} = {
   'contents' => [
@@ -142,7 +142,7 @@
 $result_trees{'contents'}{'contents'}[1]{'contents'}[22]{'parent'} = 
$result_trees{'contents'}{'contents'}[1];
 $result_trees{'contents'}{'contents'}[1]{'parent'} = $result_trees{'contents'};
 
-$result_texts{'contents'} = '
+$result_texis{'contents'} = '
 first @@contents @contents line following first content
 second @@contents @contents line following second content
 Third content on the following line on his own

Index: t/results/misc_commands/definfoenclose.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/definfoenclose.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/misc_commands/definfoenclose.pl   13 Oct 2010 23:21:39 -0000      
1.7
+++ t/results/misc_commands/definfoenclose.pl   17 Oct 2010 09:12:51 -0000      
1.8
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'definfoenclose'} = {
   'contents' => [
@@ -332,7 +332,7 @@
 $result_trees{'definfoenclose'}{'contents'}[13]{'contents'}[1]{'parent'} = 
$result_trees{'definfoenclose'}{'contents'}[13];
 $result_trees{'definfoenclose'}{'contents'}[13]{'parent'} = 
$result_trees{'definfoenclose'};
 
-$result_texts{'definfoenclose'} = '
+$result_texis{'definfoenclose'} = '
 definfoenclose phoo,//,\\  @definfoenclose phoo,//,\\
 
 @phoo{bar}

Index: t/results/misc_commands/index_entries.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/index_entries.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/misc_commands/index_entries.pl    12 Oct 2010 16:45:08 -0000      
1.4
+++ t/results/misc_commands/index_entries.pl    17 Oct 2010 09:12:51 -0000      
1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'index_entries'} = {
   'contents' => [
@@ -102,7 +102,7 @@
 $result_trees{'index_entries'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'index_entries'}{'contents'}[4];
 $result_trees{'index_entries'}{'contents'}[4]{'parent'} = 
$result_trees{'index_entries'};
 
-$result_texts{'index_entries'} = '@cindex cindex entry
+$result_texis{'index_entries'} = '@cindex cindex entry
 
 @defindex truc
 

Index: t/results/misc_commands/invalid_clickstyle.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/invalid_clickstyle.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/misc_commands/invalid_clickstyle.pl       12 Oct 2010 09:59:15 
-0000      1.5
+++ t/results/misc_commands/invalid_clickstyle.pl       17 Oct 2010 09:12:51 
-0000      1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'invalid_clickstyle'} = {
   'contents' => [
@@ -189,7 +189,7 @@
 $result_trees{'invalid_clickstyle'}{'contents'}[11]{'contents'}[2]{'parent'} = 
$result_trees{'invalid_clickstyle'}{'contents'}[11];
 $result_trees{'invalid_clickstyle'}{'contents'}[11]{'parent'} = 
$result_trees{'invalid_clickstyle'};
 
-$result_texts{'invalid_clickstyle'} = '
+$result_texis{'invalid_clickstyle'} = '
 @clickstyle @result on the same line
 
 A @click{} (result on the same line).

Index: t/results/misc_commands/many_lines.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/many_lines.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/misc_commands/many_lines.pl       12 Oct 2010 16:45:08 -0000      
1.4
+++ t/results/misc_commands/many_lines.pl       17 Oct 2010 09:12:51 -0000      
1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'many_lines'} = {
   'contents' => [
@@ -1080,7 +1080,7 @@
 $result_trees{'many_lines'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'many_lines'}{'contents'}[4];
 $result_trees{'many_lines'}{'contents'}[4]{'parent'} = 
$result_trees{'many_lines'};
 
-$result_texts{'many_lines'} = 'pagesizes @pagesizes 200mm,150mm following 
@@pagesizes arg
+$result_texis{'many_lines'} = 'pagesizes @pagesizes 200mm,150mm following 
@@pagesizes arg
 afourpaper @afourpaper
 smallbook @smallbook
 headings @headings on line following headings

Index: t/results/misc_commands/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/simple.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/misc_commands/simple.pl   12 Oct 2010 16:45:08 -0000      1.3
+++ t/results/misc_commands/simple.pl   17 Oct 2010 09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'simple'} = {
   'contents' => [
@@ -35,7 +35,7 @@
 $result_trees{'simple'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[0];
 $result_trees{'simple'}{'contents'}[0]{'parent'} = $result_trees{'simple'};
 
-$result_texts{'simple'} = '@defindex idx';
+$result_texis{'simple'} = '@defindex idx';
 
 $result_errors{'simple'} = [];
 

Index: t/results/misc_commands/sp.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/sp.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/misc_commands/sp.pl       16 Oct 2010 19:57:50 -0000      1.6
+++ t/results/misc_commands/sp.pl       17 Oct 2010 09:12:51 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'sp'} = {
   'contents' => [
@@ -173,7 +173,7 @@
 $result_trees{'sp'}{'contents'}[7]{'args'}[0]{'parent'} = 
$result_trees{'sp'}{'contents'}[7];
 $result_trees{'sp'}{'contents'}[7]{'parent'} = $result_trees{'sp'};
 
-$result_texts{'sp'} = '
+$result_texis{'sp'} = '
 Text line followed on the same line and another below @sp 1
 @sp 2
 Text line after the sp followed by a sp @sp 1

Index: t/results/paragraph/close_paragraph_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/paragraph/close_paragraph_command.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/paragraph/close_paragraph_command.pl      16 Oct 2010 19:57:50 
-0000      1.7
+++ t/results/paragraph/close_paragraph_command.pl      17 Oct 2010 09:12:51 
-0000      1.8
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'close_paragraph_command'} = {
   'contents' => [
@@ -114,7 +114,7 @@
 
$result_trees{'close_paragraph_command'}{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'close_paragraph_command'}{'contents'}[6];
 $result_trees{'close_paragraph_command'}{'contents'}[6]{'parent'} = 
$result_trees{'close_paragraph_command'};
 
-$result_texts{'close_paragraph_command'} = 'para @titlefont{in titlefont} 
after titlefont.
+$result_texis{'close_paragraph_command'} = 'para @titlefont{in titlefont} 
after titlefont.
 
 p before sp
 @sp 4

Index: t/results/paragraph/comment_between_text.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/paragraph/comment_between_text.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/paragraph/comment_between_text.pl 25 Sep 2010 10:01:35 -0000      
1.1
+++ t/results/paragraph/comment_between_text.pl 17 Oct 2010 09:12:51 -0000      
1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'comment_between_text'} = {
   'contents' => [
@@ -37,7 +37,7 @@
 $result_trees{'comment_between_text'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'comment_between_text'}{'contents'}[0];
 $result_trees{'comment_between_text'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_between_text'};
 
-$result_texts{'comment_between_text'} = 'text
+$result_texis{'comment_between_text'} = 'text
 @c comment
 end para';
 

Index: t/results/paragraph/no_paragraph_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/paragraph/no_paragraph_commands.pl        13 Oct 2010 23:21:40 
-0000      1.3
+++ t/results/paragraph/no_paragraph_commands.pl        17 Oct 2010 09:12:51 
-0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'no_paragraph_commands'} = {
   'contents' => [
@@ -118,7 +118,7 @@
 $result_trees{'no_paragraph_commands'}{'contents'}[4]{'parent'} = 
$result_trees{'no_paragraph_commands'};
 $result_trees{'no_paragraph_commands'}{'contents'}[5]{'parent'} = 
$result_trees{'no_paragraph_commands'};
 
-$result_texts{'no_paragraph_commands'} = '@*
+$result_texis{'no_paragraph_commands'} = '@*
 @titlefont{title font}
 @image{aa,bb,cc,dd,ee}
 ';

Index: t/results/paragraph/paragraph_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/paragraph_command.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/paragraph/paragraph_command.pl    9 Oct 2010 17:51:38 -0000       
1.3
+++ t/results/paragraph/paragraph_command.pl    17 Oct 2010 09:12:51 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'paragraph_command'} = {
   'contents' => [
@@ -64,7 +64,7 @@
 $result_trees{'paragraph_command'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'paragraph_command'}{'contents'}[2];
 $result_trees{'paragraph_command'}{'contents'}[2]{'parent'} = 
$result_trees{'paragraph_command'};
 
-$result_texts{'paragraph_command'} = '@@
+$result_texis{'paragraph_command'} = '@@
 
 @b{aaa}.
 ';

Index: t/results/paragraph/text.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/text.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/paragraph/text.pl 25 Sep 2010 10:01:35 -0000      1.1
+++ t/results/paragraph/text.pl 17 Oct 2010 09:12:51 -0000      1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'text'} = {
   'contents' => [
@@ -17,7 +17,7 @@
 $result_trees{'text'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'text'}{'contents'}[0];
 $result_trees{'text'}{'contents'}[0]{'parent'} = $result_trees{'text'};
 
-$result_texts{'text'} = 'text';
+$result_texis{'text'} = 'text';
 
 $result_errors{'text'} = [];
 

Index: t/results/paragraph/text_comment.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/text_comment.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/paragraph/text_comment.pl 25 Sep 2010 10:01:35 -0000      1.1
+++ t/results/paragraph/text_comment.pl 17 Oct 2010 09:12:51 -0000      1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'text_comment'} = {
   'contents' => [
@@ -30,7 +30,7 @@
 $result_trees{'text_comment'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'text_comment'}{'contents'}[0];
 $result_trees{'text_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'text_comment'};
 
-$result_texts{'text_comment'} = 'address@hidden comment';
+$result_texis{'text_comment'} = 'address@hidden comment';
 
 $result_errors{'text_comment'} = [];
 

Index: t/results/paragraph/text_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/text_line.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/paragraph/text_line.pl    9 Oct 2010 17:51:38 -0000       1.2
+++ t/results/paragraph/text_line.pl    17 Oct 2010 09:12:51 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'text_line'} = {
   'contents' => [
@@ -32,7 +32,7 @@
 $result_trees{'text_line'}{'contents'}[1]{'parent'} = 
$result_trees{'text_line'};
 $result_trees{'text_line'}{'contents'}[2]{'parent'} = 
$result_trees{'text_line'};
 
-$result_texts{'text_line'} = '
+$result_texis{'text_line'} = '
 text
 
 ';

Index: t/results/paragraph/text_space_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/paragraph/text_space_comment.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/paragraph/text_space_comment.pl   10 Oct 2010 18:48:14 -0000      
1.2
+++ t/results/paragraph/text_space_comment.pl   17 Oct 2010 09:12:51 -0000      
1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'text_space_comment'} = {
   'contents' => [
@@ -35,7 +35,7 @@
 $result_trees{'text_space_comment'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'text_space_comment'}{'contents'}[1];
 $result_trees{'text_space_comment'}{'contents'}[1]{'parent'} = 
$result_trees{'text_space_comment'};
 
-$result_texts{'text_space_comment'} = ' text  @c space comment';
+$result_texis{'text_space_comment'} = ' text  @c space comment';
 
 $result_errors{'text_space_comment'} = [];
 

Index: t/results/paragraph/two_lines.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/two_lines.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/paragraph/two_lines.pl    25 Sep 2010 10:01:35 -0000      1.1
+++ t/results/paragraph/two_lines.pl    17 Oct 2010 09:12:51 -0000      1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'two_lines'} = {
   'contents' => [
@@ -24,7 +24,7 @@
 $result_trees{'two_lines'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'two_lines'}{'contents'}[0];
 $result_trees{'two_lines'}{'contents'}[0]{'parent'} = 
$result_trees{'two_lines'};
 
-$result_texts{'two_lines'} = 'text l 1
+$result_texis{'two_lines'} = 'text l 1
 text l 2
 ';
 

Index: t/results/raw/misc_raw.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/misc_raw.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/raw/misc_raw.pl   12 Oct 2010 09:59:15 -0000      1.3
+++ t/results/raw/misc_raw.pl   17 Oct 2010 09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'misc_raw'} = {
   'contents' => [
@@ -115,7 +115,7 @@
 $result_trees{'misc_raw'}{'contents'}[7]{'parent'} = $result_trees{'misc_raw'};
 $result_trees{'misc_raw'}{'contents'}[8]{'parent'} = $result_trees{'misc_raw'};
 
-$result_texts{'misc_raw'} = '
+$result_texis{'misc_raw'} = '
 @html 
 in html @end html
 

Index: t/results/raw/misc_raw_comments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/misc_raw_comments.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/raw/misc_raw_comments.pl  12 Oct 2010 11:33:50 -0000      1.4
+++ t/results/raw/misc_raw_comments.pl  17 Oct 2010 09:12:51 -0000      1.5
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'misc_raw_comments'} = {
   'contents' => [
@@ -141,7 +141,7 @@
 $result_trees{'misc_raw_comments'}{'contents'}[8]{'parent'} = 
$result_trees{'misc_raw_comments'};
 $result_trees{'misc_raw_comments'}{'contents'}[9]{'parent'} = 
$result_trees{'misc_raw_comments'};
 
-$result_texts{'misc_raw_comments'} = '
+$result_texis{'misc_raw_comments'} = '
 @html @c comment space
 in html @end address@hidden comment no space
 

Index: t/results/raw/nested_macros.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/nested_macros.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/raw/nested_macros.pl      12 Oct 2010 09:59:15 -0000      1.6
+++ t/results/raw/nested_macros.pl      17 Oct 2010 09:12:51 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'nested_macros'} = {
   'contents' => [
@@ -103,7 +103,7 @@
 $result_trees{'nested_macros'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_macros'};
 $result_trees{'nested_macros'}{'contents'}[1]{'parent'} = 
$result_trees{'nested_macros'};
 
-$result_texts{'nested_macros'} = '@macro truc   { arg,  ex}
+$result_texis{'nested_macros'} = '@macro truc   { arg,  ex}
 in macro \\arg\\
 @macro othermacro 
 other macro

Index: t/results/raw/raw_in_para.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/raw_in_para.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/raw/raw_in_para.pl        12 Oct 2010 09:59:15 -0000      1.3
+++ t/results/raw/raw_in_para.pl        17 Oct 2010 09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'raw_in_para'} = {
   'contents' => [
@@ -182,7 +182,7 @@
 $result_trees{'raw_in_para'}{'contents'}[8]{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[8];
 $result_trees{'raw_in_para'}{'contents'}[8]{'parent'} = 
$result_trees{'raw_in_para'};
 
-$result_texts{'raw_in_para'} = 'para
+$result_texis{'raw_in_para'} = 'para
 @verbatim
 in verbatim
 @end verbatim

Index: t/results/sectioning/node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/node.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/node.pl        13 Oct 2010 23:21:40 -0000      1.6
+++ t/results/sectioning/node.pl        17 Oct 2010 09:12:51 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'node'} = {
   'contents' => [
@@ -485,7 +485,7 @@
 $result_trees{'node'}{'contents'}[9]{'args'}[2]{'parent'} = 
$result_trees{'node'}{'contents'}[9];
 $result_trees{'node'}{'contents'}[9]{'parent'} = $result_trees{'node'};
 
-$result_texts{'node'} = '
+$result_texis{'node'} = '
 @node one arg 
 @node one arg, two arg
 @node one arg, two arg, three arg

Index: t/results/sectioning/sections.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/sections.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/sectioning/sections.pl    12 Oct 2010 16:45:08 -0000      1.3
+++ t/results/sectioning/sections.pl    17 Oct 2010 09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'sections'} = {
   'contents' => [
@@ -31,7 +31,7 @@
 $result_trees{'sections'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'sections'}{'contents'}[0];
 $result_trees{'sections'}{'contents'}[0]{'parent'} = $result_trees{'sections'};
 
-$result_texts{'sections'} = '@chapter a chapter
+$result_texis{'sections'} = '@chapter a chapter
 ';
 
 $result_errors{'sections'} = [];

Index: t/results/value/bad_syntax.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/bad_syntax.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/value/bad_syntax.pl       12 Oct 2010 09:59:15 -0000      1.6
+++ t/results/value/bad_syntax.pl       17 Oct 2010 09:12:51 -0000      1.7
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'bad_syntax'} = {
   'contents' => [
@@ -91,7 +91,7 @@
 $result_trees{'bad_syntax'}{'contents'}[8]{'parent'} = 
$result_trees{'bad_syntax'};
 $result_trees{'bad_syntax'}{'contents'}[10]{'parent'} = 
$result_trees{'bad_syntax'};
 
-$result_texts{'bad_syntax'} = '
+$result_texis{'bad_syntax'} = '
 @set
 @set 
 @set ?

Index: t/results/value/empty_set.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/empty_set.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/value/empty_set.pl        12 Oct 2010 09:59:15 -0000      1.3
+++ t/results/value/empty_set.pl        17 Oct 2010 09:12:51 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'empty_set'} = {
   'contents' => [
@@ -48,7 +48,7 @@
 $result_trees{'empty_set'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'empty_set'}{'contents'}[2];
 $result_trees{'empty_set'}{'contents'}[2]{'parent'} = 
$result_trees{'empty_set'};
 
-$result_texts{'empty_set'} = '@set myspace
+$result_texis{'empty_set'} = '@set myspace
 
 1  1
 ';

Index: t/results/value/empty_value_in_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/empty_value_in_line.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/value/empty_value_in_line.pl      12 Oct 2010 09:59:15 -0000      
1.3
+++ t/results/value/empty_value_in_line.pl      17 Oct 2010 09:12:51 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'empty_value_in_line'} = {
   'contents' => [
@@ -68,7 +68,7 @@
 $result_trees{'empty_value_in_line'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'empty_value_in_line'}{'contents'}[4];
 $result_trees{'empty_value_in_line'}{'contents'}[4]{'parent'} = 
$result_trees{'empty_value_in_line'};
 
-$result_texts{'empty_value_in_line'} = '@set myspace
+$result_texis{'empty_value_in_line'} = '@set myspace
 
 1 
  

Index: t/results/value/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/simple.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/value/simple.pl   12 Oct 2010 09:59:15 -0000      1.5
+++ t/results/value/simple.pl   17 Oct 2010 09:12:51 -0000      1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'simple'} = {
   'contents' => [
@@ -87,7 +87,7 @@
 $result_trees{'simple'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[2];
 $result_trees{'simple'}{'contents'}[2]{'parent'} = $result_trees{'simple'};
 
-$result_texts{'simple'} = '@set a-_5b the value @b{b} @c comment
+$result_texis{'simple'} = '@set a-_5b the value @b{b} @c comment
 
 the value @b{b} @c comment After value.
 ';

Index: t/results/value/value_after_accent.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_after_accent.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/value/value_after_accent.pl       12 Oct 2010 09:59:15 -0000      
1.2
+++ t/results/value/value_after_accent.pl       17 Oct 2010 09:12:51 -0000      
1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'value_after_accent'} = {
   'contents' => [
@@ -61,7 +61,7 @@
 $result_trees{'value_after_accent'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'value_after_accent'}{'contents'}[1];
 $result_trees{'value_after_accent'}{'contents'}[1]{'parent'} = 
$result_trees{'value_after_accent'};
 
-$result_texts{'value_after_accent'} = '@set a_letter a
+$result_texis{'value_after_accent'} = '@set a_letter a
 @ringaccenta
 @~a';
 

Index: t/results/value/value_in_index_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value/value_in_index_commands.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/value/value_in_index_commands.pl  16 Oct 2010 13:41:22 -0000      
1.1
+++ t/results/value/value_in_index_commands.pl  17 Oct 2010 09:12:51 -0000      
1.2
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'value_in_index_commands'} = {
   'contents' => [
@@ -1301,7 +1301,7 @@
 $result_trees{'value_in_index_commands'}{'contents'}[67]{'args'}[0]{'parent'} 
= $result_trees{'value_in_index_commands'}{'contents'}[67];
 $result_trees{'value_in_index_commands'}{'contents'}[67]{'parent'} = 
$result_trees{'value_in_index_commands'};
 
-$result_texts{'value_in_index_commands'} = '@set cp cp
+$result_texis{'value_in_index_commands'} = '@set cp cp
 @set fn fn
 @set syncodeindex_command @syncodeindex
 

Index: t/results/value/value_in_misc_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/value/value_in_misc_commands.pl   16 Oct 2010 19:57:50 -0000      
1.2
+++ t/results/value/value_in_misc_commands.pl   17 Oct 2010 09:12:51 -0000      
1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'value_in_misc_commands'} = {
   'contents' => [
@@ -2621,7 +2621,7 @@
 $result_trees{'value_in_misc_commands'}{'contents'}[146]{'parent'} = 
$result_trees{'value_in_misc_commands'};
 $result_trees{'value_in_misc_commands'}{'contents'}[147]{'parent'} = 
$result_trees{'value_in_misc_commands'};
 
-$result_texts{'value_in_misc_commands'} = '@set text atext
+$result_texis{'value_in_misc_commands'} = '@set text atext
 
 @node Top
 @top top atext

Index: t/results/value/value_in_node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_in_node.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/value/value_in_node.pl    13 Oct 2010 23:21:40 -0000      1.7
+++ t/results/value/value_in_node.pl    17 Oct 2010 09:12:51 -0000      1.8
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'value_in_node'} = {
   'contents' => [
@@ -526,7 +526,7 @@
 $result_trees{'value_in_node'}{'contents'}[18]{'contents'}[1]{'parent'} = 
$result_trees{'value_in_node'}{'contents'}[18];
 $result_trees{'value_in_node'}{'contents'}[18]{'parent'} = 
$result_trees{'value_in_node'};
 
-$result_texts{'value_in_node'} = '@set node1 Node 1
+$result_texis{'value_in_node'} = '@set node1 Node 1
 
 @node Top, (dir), (dir), (dir)
 @top Expansion in Node Names

Index: t/results/value/value_node_directions.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_node_directions.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/value/value_node_directions.pl    13 Oct 2010 23:21:40 -0000      
1.5
+++ t/results/value/value_node_directions.pl    17 Oct 2010 09:12:52 -0000      
1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'value_node_directions'} = {
   'contents' => [
@@ -360,7 +360,7 @@
 $result_trees{'value_node_directions'}{'contents'}[10]{'args'}[0]{'parent'} = 
$result_trees{'value_node_directions'}{'contents'}[10];
 $result_trees{'value_node_directions'}{'contents'}[10]{'parent'} = 
$result_trees{'value_node_directions'};
 
-$result_texts{'value_node_directions'} = '@set a--foo bar
+$result_texis{'value_node_directions'} = '@set a--foo bar
 
 @node Top, bar, (dir), (dir)
 @top Var bar

Index: t/results/value/value_zero.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_zero.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/value/value_zero.pl       12 Oct 2010 09:59:15 -0000      1.2
+++ t/results/value/value_zero.pl       17 Oct 2010 09:12:52 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'value_zero'} = {
   'contents' => [
@@ -46,7 +46,7 @@
 $result_trees{'value_zero'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'value_zero'}{'contents'}[1];
 $result_trees{'value_zero'}{'contents'}[1]{'parent'} = 
$result_trees{'value_zero'};
 
-$result_texts{'value_zero'} = '@set zero 0
+$result_texis{'value_zero'} = '@set zero 0
 Value
 0';
 

Index: t/results/value_and_macro/comma_value_in_macro_arg.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/value_and_macro/comma_value_in_macro_arg.pl       12 Oct 2010 
09:59:15 -0000      1.5
+++ t/results/value_and_macro/comma_value_in_macro_arg.pl       17 Oct 2010 
09:12:52 -0000      1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'comma_value_in_macro_arg'} = {
   'contents' => [
@@ -152,7 +152,7 @@
 
$result_trees{'comma_value_in_macro_arg'}{'contents'}[5]{'contents'}[4]{'parent'}
 = $result_trees{'comma_value_in_macro_arg'}{'contents'}[5];
 $result_trees{'comma_value_in_macro_arg'}{'contents'}[5]{'parent'} = 
$result_trees{'comma_value_in_macro_arg'};
 
-$result_texts{'comma_value_in_macro_arg'} = '@set comma ,
+$result_texis{'comma_value_in_macro_arg'} = '@set comma ,
 
 @macro macro1 { arg1 , arg2 }
 result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}

Index: t/results/value_and_macro/macro_in_value.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value_and_macro/macro_in_value.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/value_and_macro/macro_in_value.pl 12 Oct 2010 09:59:15 -0000      
1.3
+++ t/results/value_and_macro/macro_in_value.pl 17 Oct 2010 09:12:52 -0000      
1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'macro_in_value'} = {
   'contents' => [
@@ -126,7 +126,7 @@
 $result_trees{'macro_in_value'}{'contents'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_value'}{'contents'}[7];
 $result_trees{'macro_in_value'}{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_value'};
 
-$result_texts{'macro_in_value'} = '@macro ab
+$result_texis{'macro_in_value'} = '@macro ab
 a
 
 b

Index: t/results/value_and_macro/value_in_macro_body.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value_and_macro/value_in_macro_body.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/value_and_macro/value_in_macro_body.pl    12 Oct 2010 09:59:15 
-0000      1.5
+++ t/results/value_and_macro/value_in_macro_body.pl    17 Oct 2010 09:12:52 
-0000      1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'value_in_macro_body'} = {
   'contents' => [
@@ -125,7 +125,7 @@
 $result_trees{'value_in_macro_body'}{'contents'}[5]{'contents'}[2]{'parent'} = 
$result_trees{'value_in_macro_body'}{'contents'}[5];
 $result_trees{'value_in_macro_body'}{'contents'}[5]{'parent'} = 
$result_trees{'value_in_macro_body'};
 
-$result_texts{'value_in_macro_body'} = '@set bodyarg \\arg\\ 
+$result_texis{'value_in_macro_body'} = '@set bodyarg \\arg\\ 
 
 @macro testvaluebody { arg }
 result: @address@hidden  }

Index: t/results/value_and_macro/value_in_macro_formal_arg.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/value_and_macro/value_in_macro_formal_arg.pl      12 Oct 2010 
09:59:15 -0000      1.5
+++ t/results/value_and_macro/value_in_macro_formal_arg.pl      17 Oct 2010 
09:12:52 -0000      1.6
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'value_in_macro_formal_arg'} = {
   'contents' => [
@@ -132,7 +132,7 @@
 
$result_trees{'value_in_macro_formal_arg'}{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'value_in_macro_formal_arg'}{'contents'}[5];
 $result_trees{'value_in_macro_formal_arg'}{'contents'}[5]{'parent'} = 
$result_trees{'value_in_macro_formal_arg'};
 
-$result_texts{'value_in_macro_formal_arg'} = '@set argument arg 
+$result_texis{'value_in_macro_formal_arg'} = '@set argument arg 
 
 @macro testvalue { arg , address@hidden }
 result: @emph{\\arg\\} the \\the\\ thearg \\thearg\\ with value address@hidden

Index: t/results/verb/comments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/verb/comments.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/verb/comments.pl  9 Oct 2010 17:51:38 -0000       1.3
+++ t/results/verb/comments.pl  17 Oct 2010 09:12:52 -0000      1.4
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'comments'} = {
   'contents' => [
@@ -116,7 +116,7 @@
 $result_trees{'comments'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'comments'}{'contents'}[2];
 $result_trees{'comments'}{'contents'}[2]{'parent'} = $result_trees{'comments'};
 
-$result_texts{'comments'} = '@verb{a comment @c comment
+$result_texis{'comments'} = '@verb{a comment @c comment
 in a verb address@hidden comment
 
 something @verb{, in verb,} @c other comment';

Index: t/results/verb/end_of_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/verb/end_of_line.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/verb/end_of_line.pl       4 Oct 2010 07:02:41 -0000       1.2
+++ t/results/verb/end_of_line.pl       17 Oct 2010 09:12:52 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'end_of_line'} = {
   'contents' => [
@@ -66,7 +66,7 @@
 $result_trees{'end_of_line'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'end_of_line'}{'contents'}[0];
 $result_trees{'end_of_line'}{'contents'}[0]{'parent'} = 
$result_trees{'end_of_line'};
 
-$result_texts{'end_of_line'} = 'verb at end of line @verb{
+$result_texis{'end_of_line'} = 'verb at end of line @verb{
 
 @{ in verb at end of line @c comment
 and now end}after end.';

Index: t/results/verb/multiline.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/verb/multiline.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/verb/multiline.pl 4 Oct 2010 07:02:41 -0000       1.2
+++ t/results/verb/multiline.pl 17 Oct 2010 09:12:52 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'multiline'} = {
   'contents' => [
@@ -55,7 +55,7 @@
 $result_trees{'multiline'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'multiline'}{'contents'}[0];
 $result_trees{'multiline'}{'contents'}[0]{'parent'} = 
$result_trees{'multiline'};
 
-$result_texts{'multiline'} = '@verb{@
+$result_texis{'multiline'} = '@verb{@
 qdsqsddqsdsq
 
 @}after verb.';

Index: t/results/verb/nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/verb/nested.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/verb/nested.pl    4 Oct 2010 07:02:41 -0000       1.2
+++ t/results/verb/nested.pl    17 Oct 2010 09:12:52 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'nested'} = {
   'contents' => [
@@ -61,7 +61,7 @@
 $result_trees{'nested'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested'}{'contents'}[0];
 $result_trees{'nested'}{'contents'}[0]{'parent'} = $result_trees{'nested'};
 
-$result_texts{'nested'} = '@b{in b @verb{/ in verb { } /} in b end}';
+$result_texis{'nested'} = '@b{in b @verb{/ in verb { } /} in b end}';
 
 $result_errors{'nested'} = [];
 

Index: t/results/verb/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/verb/simple.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/verb/simple.pl    4 Oct 2010 07:02:41 -0000       1.2
+++ t/results/verb/simple.pl    17 Oct 2010 09:12:52 -0000      1.3
@@ -1,4 +1,4 @@
-use vars qw(%result_texts %result_trees %result_errors);
+use vars qw(%result_texis %result_trees %result_errors);
 
 $result_trees{'simple'} = {
   'contents' => [
@@ -35,7 +35,7 @@
 $result_trees{'simple'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[0];
 $result_trees{'simple'}{'contents'}[0]{'parent'} = $result_trees{'simple'};
 
-$result_texts{'simple'} = '@verb{.  }   .  .}';
+$result_texis{'simple'} = '@verb{.  }   .  .}';
 
 $result_errors{'simple'} = [];
 

Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: Texinfo/Convert/Text.pm
diff -N Texinfo/Convert/Text.pm
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ Texinfo/Convert/Text.pm     17 Oct 2010 09:12:49 -0000      1.1
@@ -0,0 +1,281 @@
+# Text.pm: output tree as simple text.
+#
+# Copyright 2010 Free Software Foundation, Inc.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+# Original author: Patrice Dumas <address@hidden>
+
+package Texinfo::Convert::Text;
+
+use 5.00405;
+use strict;
+
+require Exporter;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
address@hidden = qw(Exporter);
+
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+
+# This allows declaration       use Texinfo::Parser ':all';
+# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
+# will save memory.
+%EXPORT_TAGS = ( 'all' => [ qw(
+) ] );
+
address@hidden = ( @{ $EXPORT_TAGS{'all'} } );
+
address@hidden = qw(
+);
+
+$VERSION = '0.01';
+
+my %ignored_brace_commands;
+foreach my $ignored_brace_command ('xref','ref','pxref','inforef','anchor',
+   'footnote', 'shortcaption', 'caption', 'hyphenation') {
+  $ignored_brace_commands{$ignored_brace_command} = 1;
+}
+
+#my %code_style_commands;
+#foreach my $command ('code', 'command', 'env', 'file', 'kbd', 'key', 'option',
+#   'samp', 'indicateurl', 'verb') {
+#  $code_style_commands{$command} = 1;
+#}
+
+my %ignored_block_commands;
+foreach my $ignored_command ('titlepage', 'copying', 'documentdescription',
+  'html', 'tex', 'xml', 'docbook', 'ignore', 'macro', 'rmacro') {
+  $ignored_block_commands{$ignored_command} = 1;
+}
+
+my %brace_no_arg_commands = (
+               'TeX'          => 'TeX',
+               'LaTeX'          => 'LaTeX',
+               'bullet'       => '*',
+               'copyright' => '(C)',
+               'registeredsymbol'   => '(R)',
+               'dots'         => '...',
+               'enddots'      => '...',
+               'equiv'        => '==',
+# FIXME i18n
+               'error'        => 'error-->',
+               'expansion'    => '==>',
+               'arrow'        => '->',
+               'minus'        => '-',
+               'point'        => '-!-',
+               'print'        => '-|',
+               'result'       => '=>',
+               'today'        => '',
+               'aa'           => 'aa',
+               'AA'           => 'AA',
+               'ae'           => 'ae',
+               'oe'           => 'oe',
+               'AE'           => 'AE',
+               'OE'           => 'OE',
+               'o'            => '/o',
+               'O'            => '/O',
+               'ss'           => 'ss',
+               'l'            => '/l',
+               'L'            => '/L',
+               'DH'           => 'D',
+               'dh'           => 'd',
+               'TH'           => 'TH', # 
http://www.evertype.com/standards/wynnyogh/thorn.html
+
+               'th'           => 'th',
+               'exclamdown'   => '!',
+               'questiondown' => '?',
+               'pounds'       => '#',
+               'ordf'         => 'a',
+               'ordm'         => 'o',
+               'comma'        => ',',
+               'euro'         => 'Euro',
+               'geq'          => '>=',
+               'leq'          => '<=',
+               'tie'          => ' ',
+               'textdegree'          => 'o',
+               'quotedblleft'          => '``',
+               'quotedblright'          => "''",
+               'quoteleft'          => '`',
+               'quoteright'          => "'",
+               'quotedblbase'          => ',,',
+               'quotesinglbase'          => ',',
+               'guillemetleft'          => '<<',
+               'guillemetright'          => '>>',
+               'guillemotleft'          => '<<',
+               'guillemotright'          => '>>',
+               'guilsinglleft'          => '<',
+               'guilsinglright'          => '>',
+);
+
+my %no_brace_commands = (
+           '*', "\n",
+           ' ', ' ',
+           "\t", ' ',
+           "\n", ' ',
+           '-', '',  # hyphenation hint
+           '|', '',  # used in formatting commands @evenfooting and friends
+           '/', '',
+           ':', '',
+           '!', '!',
+           '?', '?',
+           '.', '.',
+           '@', '@',
+           '}', '}',
+           '{', '{',
+);
+
+my %accent_commands;
+foreach my $accent_command ('"','~','^','`',"'",',','=',
+                           'ringaccent','H','dotaccent','u','ubaraccent',
+                           'udotaccent','v','ogonek','tieaccent') {
+  $accent_commands{$accent_command} = 1;
+}
+
+# node?
+my %kept_misc_commands;
+foreach my $command ('sp', 'center',
+    'top',
+    'chapter',
+    'unnumbered',
+    'chapheading',
+    'appendix',
+    'section',
+    'unnumberedsec',
+    'heading',
+    'appendixsec',
+    'subsection',
+    'unnumberedsubsec',
+    'subheading',
+    'appendixsubsec',
+    'subsubsection',
+    'unnumberedsubsubsec',
+    'subsubheading',
+    'appendixsubsubsec',
+    'part',
+    'appendixsection',
+    'majorheading',
+    'chapheading',
+    'centerchap') {
+  $kept_misc_commands{$command} = 1;
+}
+ 
+
+sub ascii_accents($$)
+{
+  my $text = shift;
+  my $accent = shift;
+  return $text if ($accent eq 'dotless');
+  return $text . "''" if ($accent eq 'H');
+  return $text . '.' if ($accent eq 'dotaccent');
+  return $text . '*' if ($accent eq 'ringaccent');
+  return $text . '[' if ($accent eq 'tieaccent');
+  return $text . '(' if ($accent eq 'u');
+  return $text . '_' if ($accent eq 'ubaraccent');
+  return '.' . $text  if ($accent eq 'udotaccent');
+  return $text . '<' if ($accent eq 'v');
+  return $text . ';' if ($accent eq 'ogonek');
+  return $text . $accent;
+}
+
+my %ignored_types;
+foreach my $type ('empty_line_after_command') {
+  $ignored_types{$type} = 1;
+}
+
+sub _normalise_space($)
+{
+  return undef unless (defined ($_[0]));
+  my $text = shift;
+  $text =~ s/\s+/ /go;
+  $text =~ s/ $//;
+  $text =~ s/^ //;
+  return $text;
+}
+
+sub convert($;$);
+
+sub convert($;$)
+{
+  my $root = shift;
+  my $state = shift;
+  
+  $state = {} if (!defined($state));
+
+  return '' if (($root->{'type'} and $ignored_types{$root->{'type'}})
+     or ($root->{'cmdname'} 
+        and ($ignored_brace_commands{$root->{'cmdname'}} 
+           or $ignored_block_commands{$root->{'cmdname'}}
+           or ($root->{'args'} and $root->{'args'}->[0] 
+               and $root->{'args'}->[0]->{'type'} 
+               and ($root->{'args'}->[0]->{'type'} eq 'misc_line_arg'
+                    or $root->{'args'}->[0]->{'type'} eq 'misc_arg') 
+               and !$kept_misc_commands{$root->{'cmdname'}}))));
+  my $result = '';
+  if (defined($root->{'text'})) {
+    $result = $root->{'text'};
+    $result =~ s/\s*$// if ($state->{'trim_end_space'});
+    $result =~ s/^\s*// if ($state->{'trim_begin_space'});
+  }
+  if ($root->{'cmdname'}) {
+    if ($no_brace_commands{$root->{'cmdname'}}) {
+      return $no_brace_commands{$root->{'cmdname'}};
+    } elsif ($brace_no_arg_commands{$root->{'cmdname'}}) {
+      return $brace_no_arg_commands{$root->{'cmdname'}};
+    # commands with braces
+    } elsif ($accent_commands{$root->{'cmdname'}}) {
+      return '' if (!$root->{'args'});
+      return ascii_accents(convert($root->{'args'}->[0]), $root->{'cmdname'});
+    } elsif ($root->{'cmdname'} eq 'image') {
+      return convert($root->{'args'}->[0], {'trim_around_spaces' => 1});
+    } elsif ($root->{'cmdname'} eq 'email') {
+      my $mail = _normalise_space(convert($root->{'args'}->[0]));
+      my $text;
+      $text = _normalise_space(convert($root->{'args'}->[1])) 
+         if (defined($root->{'args'}->[1]));
+      return $text if (defined($text) and ($text ne ''));
+      return $mail;
+    } elsif ($root->{'args'} and $root->{'args'}->[0] 
+           and $root->{'args'}->[0]->{'type'}
+           and $root->{'args'}->[0]->{'type'} eq 'brace_command_argument') {
+      return convert($root->{'args'}->[0]);
+    }
+    # block commands
+    if (($root->{'cmdname'} eq 'quotation'
+          or $root->{'cmdname'} eq 'smallquotation')) {
+      if ($root->{'args'}) {
+        $result = convert($root->{'args'}->[0]) ."\n";
+      }
+    }
+  }
+  if ($root->{'contents'}) {
+    my $content_nr = 0;
+    foreach my $content (@{$root->{'contents'}}) {
+      $content_nr++;
+      my $convert_state = {};
+      if ($state->{'trim_around_spaces'}) {
+        if ($content_nr == 1) {
+          $convert_state = {'trim_begin_space' => 1};
+        } elsif ($content_nr == scalar(@{$root->{'contents'}})) {
+          $convert_state = {'trim_end_space' => 1};
+        }
+      }
+      $result .= convert($content, $convert_state);
+    }
+  }
+  return $result;
+}
+
+1;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]