texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Convert/XML.pm t/xml_tests.t...


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Convert/XML.pm t/xml_tests.t...
Date: Mon, 03 Sep 2012 21:58:52 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/09/03 21:58:51

Modified files:
        tp/Texinfo/Convert: XML.pm 
        tp/t           : xml_tests.t 
        tp/t/results/converters_tests: at_commands_in_refs.pl 
                                       complex_nestings.pl 
                                       documentencoding_utf8_and_insertions.pl 
                                       image_formatting.pl 
                                       no_documentencoding_and_insertions.pl 
                                       normal_font_in_monospace.pl 
                                       raw_block_commands.pl 
                                       raw_block_commands_expand_tex.pl 
                                       ref_in_sectioning.pl 
                                       some_at_commands_in_ref_nodes.pl 
                                       sp_in_example.pl 
                                       spaces_in_empty_node_names.pl 
                                       spaces_in_node_names.pl 
                                       table_in_display_in_example.pl 
                                       table_in_example_in_display.pl 
                                       test_deftypefnnewline.pl 
                                       things_before_setfilename.pl 
                                       things_before_setfilename_no_element.pl 
        tp/t/results/coverage: block_commands.pl cartouche.pl 
                               cartouche_in_example.pl 
                               cartouche_in_quotation.pl 
                               comment_on_cartouche_line.pl 
                               comment_on_group_line.pl def.pl 
                               exdent_and_commands.pl 
                               exdent_and_formats.pl 
                               flushleft_flushright.pl 
                               flushleft_flushright_in_quotation.pl 
                               flushright_example_nested.pl 
                               insertcopying.pl item_container.pl 
                               multitable.pl nested_block_commands.pl 
                               preformatted.pl 
                               punctuation_in_line_commands.pl 
                               quotation_author.pl 
                               symbol_after_command.pl table.pl 
                               table_command_comment.pl 
        tp/t/results/menu: block_commands_in_menu_description.pl 
                           comment_on_menu_line.pl dash_in_menu.pl 
                           detailmenu.pl detailmenu_in_description.pl 
                           detailmenu_on_subnodes.pl 
                           entry_after_detailmenu.pl 
                           example_in_menu_comment.pl 
                           example_in_menu_description.pl 
                           formats_in_menu.pl 
                           inlineraw_in_menu_description.pl 
                           menu_entry_name.pl menu_entry_name_comment.pl 
                           menu_entry_no_entry.pl 
                           menu_entry_no_entry_location.pl 
                           menu_entry_node.pl 
                           menu_entry_node_comments.pl 
                           menu_in_example.pl menu_pointing_to_anchor.pl 
                           menu_title_before_entries.pl 
                           no_colon_in_menu.pl 
                           reference_to_external_manual.pl sc_in_menu.pl 
                           simple.pl simple_no_menu.pl 
                           verb_in_menu_description.pl 
        tp/t/results/misc_commands: comment_space_command_on_line.pl 
        tp/t/results/multitable: empty_item_tab.pl 
                                 inter_item_commands_in_multitable.pl 
                                 multitable_in_example.pl 
                                 multitable_with_empty_item_tab.pl 
                                 not_letters_in_prototype.pl 
                                 paragraph_in_cells.pl 
                                 prototype_brace_no_brace.pl 
                                 prototype_brace_no_brace_comment.pl 
                                 prototype_no_brace.pl 
                                 w_in_multitable.pl 
        tp/t/results/preformatted: caption_in_example.pl 
                                   comment_example_and_blank_lines.pl 
                                   comments_in_example.pl 
                                   def_in_example.pl empty_line.pl 
                                   insertcopying_in_example.pl 
                                   nested_example_and_comment.pl 
                                   nested_formats.pl page_in_example.pl 
                                   quote_dash_in_display.pl 
                                   quote_dash_in_example.pl 
                                   text_on_command_line.pl 
                                   titlefont_in_example.pl 
        tp/t/results/quotation: comment_on_quotation_line.pl 
                                empty_quotation.pl 
                                only_comment_on_quotation_line.pl 
                                quotation_and_author.pl 
                                quotation_author_in_example.pl 
                                quotation_beginning_and_end_on_line.pl 
                                space_at_commands_end_quotation_line.pl 
                                standard_quotations.pl 
        tp/t/results/sectioning: chapter_between_nodes.pl 
                                 chapter_node_before_and_after_part.pl 
                                 double_node_anchor_float.pl 
                                 double_part.pl 
                                 explicit_node_directions.pl 
                                 more_sections_than_nodes.pl 
                                 node_part_chapter_after_chapter.pl 
                                 node_part_chapter_after_top.pl 
                                 nodes_after_top_before_chapter_nodes.pl 
                                 nodes_no_node_top_explicit_directions.pl 
                                 part_chapter_after_top.pl 
                                 part_node_after_top.pl 
                                 part_node_before_top.pl 
                                 part_node_chapter_after_top.pl 
                                 part_node_chapter_appendix.pl 
                                 part_node_chapter_node_appendix.pl 
                                 part_node_node_part_appendix.pl 
                                 part_node_part_appendix.pl 
                                 part_node_part_node_appendix.pl 
                                 section_before_top.pl 
                                 section_in_unnumbered_plaintext.pl 
                                 two_nodes_between_chapters.pl 
        tp/t/results/xml_tests: commands_and_spaces.pl 
                                comments_on_block_command_lines.pl 
                                image_inline_or_not.pl raw.pl 
        tp/t/results/xtable: accent_on_table_line.pl 
                             block_commands_in_table.pl 
                             comment_and_itemx_before_item.pl 
                             definfoenclose_on_table_line.pl 
                             empty_item_itemx.pl 
                             inter_item_commands_in_table.pl 
                             inter_item_commands_in_table_in_example.pl 
                             long_item.pl table_nested.pl 
        tp/tests/formatting/res_parser/cond_xml: cond.xml 
        tp/tests/layout/res_parser/formatting_xml: formatting.xml 
Added files:
        tp/t/results/xml_tests: comments_end_lines.pl 
                                comments_on_misc_command_line.pl 
                                raw_and_comments.pl 

Log message:
        Keep information about spaces between @end and the argument.
        Keep spaces after the argument.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/xml_tests.t?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/complex_nestings.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/image_formatting.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/normal_font_in_monospace.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/raw_block_commands.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/sp_in_example.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/table_in_display_in_example.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/table_in_example_in_display.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/cartouche.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/cartouche_in_example.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/cartouche_in_quotation.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/comment_on_group_line.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_commands.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_formats.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushleft_flushright.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushright_example_nested.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/insertcopying.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/nested_block_commands.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/quotation_author.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_command.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/comment_on_menu_line.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/dash_in_menu.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu.pl?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu_in_description.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/entry_after_detailmenu.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/example_in_menu_comment.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/example_in_menu_description.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/formats_in_menu.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_name.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_name_comment.pl?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_no_entry.pl?cvsroot=texinfo&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_no_entry_location.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_node.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_node_comments.pl?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_in_example.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_title_before_entries.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/no_colon_in_menu.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/reference_to_external_manual.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/sc_in_menu.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple.pl?cvsroot=texinfo&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple_no_menu.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/verb_in_menu_description.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/empty_item_tab.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_in_example.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_with_empty_item_tab.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/not_letters_in_prototype.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/paragraph_in_cells.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/prototype_brace_no_brace.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/prototype_brace_no_brace_comment.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/prototype_no_brace.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/w_in_multitable.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/caption_in_example.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/comment_example_and_blank_lines.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/comments_in_example.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/def_in_example.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/empty_line.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/insertcopying_in_example.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/nested_example_and_comment.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/nested_formats.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/page_in_example.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/quote_dash_in_display.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/quote_dash_in_example.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/text_on_command_line.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/titlefont_in_example.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/comment_on_quotation_line.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/empty_quotation.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/only_comment_on_quotation_line.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/quotation_and_author.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/quotation_author_in_example.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/space_at_commands_end_quotation_line.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/quotation/standard_quotations.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_part.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/explicit_node_directions.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_after_top.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_before_top.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_appendix.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_node_appendix.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_part_appendix.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_part_node_appendix.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_top.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/raw.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_end_lines.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_misc_command_line.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/raw_and_comments.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/accent_on_table_line.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/block_commands_in_table.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/comment_and_itemx_before_item.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/empty_item_itemx.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/long_item.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/table_nested.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/cond_xml/cond.xml?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.11&r2=1.12

Patches:
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- Texinfo/Convert/XML.pm      2 Sep 2012 20:34:41 -0000       1.78
+++ Texinfo/Convert/XML.pm      3 Sep 2012 21:58:41 -0000       1.79
@@ -396,6 +396,30 @@
   }
 }
 
+sub _end_line_spaces($$)
+{
+  my $root = shift;
+  my $type = shift;
+
+  my $end_spaces = undef;
+  if ($root->{'args'}->[-1]->{'contents'}) {
+    my $index = -1;
+    if ($root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'}
+        and ($root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'} eq 'c' 
+             or $root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'} eq 
'comment')) {
+      $index = -2;
+    }
+    if ($root->{'args'}->[-1]->{'contents'}->[$index]
+        and $root->{'args'}->[-1]->{'contents'}->[$index]->{'type'}
+        and $root->{'args'}->[-1]->{'contents'}->[$index]->{'type'} eq $type
+        and defined($root->{'args'}->[-1]->{'contents'}->[$index]->{'text'})
+        and $root->{'args'}->[-1]->{'contents'}->[$index]->{'text'} !~ /\S/) {
+      $end_spaces = $root->{'args'}->[-1]->{'contents'}->[$index]->{'text'};
+      chomp $end_spaces;
+    }
+  }
+  return $end_spaces;
+}
 
 sub _arg_line($)
 {
@@ -993,10 +1017,9 @@
         $self->{'document_context'}->[-1]->{'raw'} = 1;
       } else {
         my $end_command = $root->{'extra'}->{'end_command'};
-        my $end_command_space = '';
-      #  my $end_command_space = _leading_spaces($end_command);
+        my $end_command_space = _leading_spaces($end_command);
         if ($end_command_space ne '') {
-      #    $end_command_space =~ s/ spaces=/ endspaces=/;
+          $end_command_space =~ s/ spaces=/ endspaces=/;
         }
         $result .= "<$root->{'cmdname'}${attribute}"._leading_spaces($root)
                              ."$end_command_space>${prepended_elements}";
@@ -1088,28 +1111,16 @@
                         and 
$root->{'args'}->[-1]->{'contents'}->[-1]->{'args'}->[-1]->{'contents'});
               }
             } else {
-              if ($root->{'args'}->[-1]->{'contents'}) {
                 # get end of lines from @*table.
-                my $index = -1;
-                if ($root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'}
-                    and 
($root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'} eq 'c' 
-                         or 
$root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'} eq 'comment')) {
-                  $index = -2;
-                }
-                if ($root->{'args'}->[-1]->{'contents'}->[$index]
-                    and $root->{'args'}->[-1]->{'contents'}->[$index]->{'type'}
-                    and 
$root->{'args'}->[-1]->{'contents'}->[$index]->{'type'} eq 
'space_at_end_block_command'
-                    and 
defined($root->{'args'}->[-1]->{'contents'}->[$index]->{'text'})
-                    and 
$root->{'args'}->[-1]->{'contents'}->[$index]->{'text'} !~ /\S/) {
-                  my $end_spaces = 
$root->{'args'}->[-1]->{'contents'}->[$index]->{'text'};
-                  chomp $end_spaces;
-                  $end_line .= $end_spaces;
+              my $end_spaces = _end_line_spaces($root, 
+                                           'space_at_end_block_command');
+              if (defined($end_spaces)) {
+                $end_line .= $end_spaces 
                   # This also catches block @-commands with no argument that
                   # have a bogus argument, such as text on @example line
                   #print STDERR "NOT xtable: $root->{'cmdname'}\n" 
                   #  if 
(!$Texinfo::Common::item_line_commands{$root->{'cmdname'}});
                 }
-              }
               $contents_possible_comment = $root->{'args'}->[-1]->{'contents'}
                 if ($root->{'args'}->[-1]->{'contents'});
             }
@@ -1255,10 +1266,12 @@
     my $end_command = $root->{'extra'}->{'end_command'}; 
     if ($self->{'expanded_formats_hash'}->{$root->{'cmdname'}}) {
     } else {
-      my $end_line;
+      my $end_line = '';
       if ($end_command) {
+        my $end_spaces = _end_line_spaces($end_command, 'spaces_at_end');
+        $end_line .= $end_spaces if (defined($end_spaces));
         $end_line 
-         = 
$self->_end_line_or_comment($end_command->{'args'}->[0]->{'contents'})
+         .= 
$self->_end_line_or_comment($end_command->{'args'}->[0]->{'contents'})
            if ($end_command->{'args'}->[0]
                and $end_command->{'args'}->[0]->{'contents'});
       } else {

Index: t/xml_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/xml_tests.t,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/xml_tests.t       2 Sep 2012 20:34:41 -0000       1.12
+++ t/xml_tests.t       3 Sep 2012 21:58:41 -0000       1.13
@@ -125,6 +125,58 @@
 @end raggedright
 
 '],
+['comments_end_lines',
+'@itemize
address@hidden itemize it
address@hidden itemize  @c comment itemize
+
address@hidden
address@hidden enumerate @c comm
+
address@hidden @asis
address@hidden it
address@hidden table @c table
+
address@hidden
+Quot no arg
address@hidden quotation @c quot no arg
+
address@hidden
+in gr
address@hidden group @c comm
+
address@hidden
+in ex
address@hidden example @c comm
+
address@hidden @columnfractions 0.4 0.6
address@hidden a @tab b
address@hidden multitable @c comm
+
address@hidden f,g
+In f
address@hidden float  @c comm
+
address@hidden
+flushright
address@hidden flushright @c comm
+
address@hidden
+raggedright
address@hidden raggedright @c comm
+'],
+['comments_on_misc_command_line',
+'@setfilename  setfilename name  @c setfilename (text)
address@hidden phoo,;,:  @c definfoenclose (number)
address@hidden none @c c (number)
address@hidden @c raisesections (skipline)
address@hidden  @comment  (noarg)
address@hidden 200mm @c pagesizes  (line)
address@hidden @thispage @| aaa @c everyheading (lineraw)
+
address@hidden @c indent (skipspace)
+Para.
+'],
 ['raw',
 '@tex
 in <tex>
@@ -135,6 +187,16 @@
 <in>
 @end xml
 '],
+['raw_and_comments',
+'@tex  @c comment
+in <tex>
address@hidden tex  @comment other comment
+
+Para
address@hidden @c in xml comment
+<in>
address@hidden xml  @comment end xml comment
+'],
 ['node_no_section',
 '@node Top
 '],

Index: t/results/converters_tests/at_commands_in_refs.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/converters_tests/at_commands_in_refs.pl   27 Aug 2012 22:04:34 
-0000      1.22
+++ t/results/converters_tests/at_commands_in_refs.pl   3 Sep 2012 21:58:41 
-0000       1.23
@@ -22668,7 +22668,7 @@
 $result_converted{'xml'}->{'at_commands_in_refs'} = '<node name="Top" spaces=" 
"><nodename>Top</nodename><nodenext automatic="on">&hyphenbreak; &lbrace; 
&rbrace;</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>Top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">&hyphenbreak; &lbrace; 
&rbrace;</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><spacecmd type="spc"/> <spacecmd type="tab"/> &eosexcl; 
&linebreak; &eosperiod; &noeos; .&noeos; &eosquest; 
&arobase;</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">&atchar; &lbracechar; &rbracechar; &backslashchar; 
&hashchar;</menunode><menudescription><pre xml:space="preserve">

Index: t/results/converters_tests/complex_nestings.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/complex_nestings.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/converters_tests/complex_nestings.pl      27 Aug 2012 00:38:46 
-0000      1.6
+++ t/results/converters_tests/complex_nestings.pl      3 Sep 2012 21:58:42 
-0000       1.7
@@ -1617,18 +1617,18 @@
 
 $result_converted{'xml'}->{'complex_nestings'} = '<node name="Top" spaces=" 
"><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
 
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">deffs
-</pre><defun spaces=" "><definitionterm><indexterm index="fn">my 
def</indexterm><defcategory automatic="on">Function</defcategory> <deffunction 
bracketed="on">my def</deffunction> <defparam>args</defparam> 
<defparam><var>arg</var></defparam> <defparam>&dots;</defparam></definitionterm>
+</pre><defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn">my 
def</indexterm><defcategory automatic="on">Function</defcategory> <deffunction 
bracketed="on">my def</deffunction> <defparam>args</defparam> 
<defparam><var>arg</var></defparam> <defparam>&dots;</defparam></definitionterm>
 <defunx spaces=" "><definitionterm><indexterm index="fn">other 
def</indexterm><defcategory automatic="on">Function</defcategory> <deffunction 
bracketed="on">other def</deffunction> <defparam>no</defparam> 
<defparam>args</defparam></definitionterm></defunx>
-<definitionitem><deffn spaces=" "><definitionterm><indexterm 
index="fn">name</indexterm><defcategory bracketed="on">type</defcategory> 
<deffunction bracketed="on">name</deffunction> <defparam>and</defparam> 
<defparam>now</defparam> <defparam>the</defparam> 
<defparam>args</defparam></definitionterm>
-<definitionitem><defvar spaces=" "><definitionterm><indexterm 
index="vr">variables</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable 
bracketed="on">variables</defvariable> 
<defparam>variable-name</defparam></definitionterm>
+<definitionitem><deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">name</indexterm><defcategory bracketed="on">type</defcategory> 
<deffunction bracketed="on">name</deffunction> <defparam>and</defparam> 
<defparam>now</defparam> <defparam>the</defparam> 
<defparam>args</defparam></definitionterm>
+<definitionitem><defvar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">variables</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable 
bracketed="on">variables</defvariable> 
<defparam>variable-name</defparam></definitionterm>
 <pre xml:space="preserve">
 </pre><defvarx spaces=" "><definitionterm><indexterm index="vr">variables 
too</indexterm><defcategory automatic="on">Variable</defcategory> <defvariable 
bracketed="on">variables too</defvariable> 
<defparam>other-variable</defparam></definitionterm></defvarx>
 <definitionitem><pre xml:space="preserve">THis is the defvar
 
 A table within the def
-</pre><table commandarg="asis" spaces=" ">
+</pre><table commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat 
command="asis">item</itemformat></item>
 </tableterm><tableitem><pre xml:space="preserve">text
 

Index: t/results/converters_tests/documentencoding_utf8_and_insertions.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/converters_tests/documentencoding_utf8_and_insertions.pl  26 Aug 
2012 14:15:11 -0000      1.7
+++ t/results/converters_tests/documentencoding_utf8_and_insertions.pl  3 Sep 
2012 21:58:42 -0000       1.8
@@ -324,7 +324,7 @@
 
 <para>&textndash; &textmdash; &textrdquo; &textldquo; &textlsquo; &textrsquo; 
<code>in code</code>. <accent type="tilde" bracketed="off">e</accent>.
 </para>
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">-- --- \'\' `` ` \' <code>in code</code>. <accent 
type="tilde" bracketed="off">e</accent>.
 </pre></example>
 ';

Index: t/results/converters_tests/image_formatting.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/converters_tests/image_formatting.pl      27 Aug 2012 22:04:35 
-0000      1.7
+++ t/results/converters_tests/image_formatting.pl      3 Sep 2012 21:58:42 
-0000       1.8
@@ -3018,7 +3018,7 @@
 
<code>&arobase;image&lbrace;&arobase;file&lbrace;f--ile&rbrace;&arobase;&arobase;&arobase;.,aze,az,alt,&arobase;file&lbrace;file
 ext&rbrace; e--xt&arobase;&rbrace;</code> <image 
where="inline"><imagefile><file>f--ile</file>&arobase;&eosperiod;</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension><file>file
 ext</file> e--xt&rbrace;</imageextension></image>
 <image where="inline"><imagefile>image</imagefile></image> <image 
where="inline"><imagefile>image</imagefile></image>
 </para>
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve"><code>&arobase;image&lbrace;f--ile&rbrace;</code> 
<image where="inline"><imagefile>f--ile</imagefile></image>
 <code>&arobase;image&lbrace;f--ile,l--i&rbrace;</code> <image 
where="inline"><imagefile>f--ile</imagefile><imagewidth>l--i</imagewidth></image>
 <code>&arobase;image&lbrace;f--ile,,l--e&rbrace;</code> <image 
where="inline"><imagefile>f--ile</imagefile><imageheight>l--e</imageheight></image>

Index: t/results/converters_tests/no_documentencoding_and_insertions.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/converters_tests/no_documentencoding_and_insertions.pl    26 Aug 
2012 14:15:13 -0000      1.7
+++ t/results/converters_tests/no_documentencoding_and_insertions.pl    3 Sep 
2012 21:58:42 -0000       1.8
@@ -274,7 +274,7 @@
 $result_converted{'xml'}->{'no_documentencoding_and_insertions'} = '
 <para>&textndash; &textmdash; &textrdquo; &textldquo; &textlsquo; &textrsquo; 
<code>in code</code>. <accent type="tilde" bracketed="off">e</accent>.
 </para>
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">-- --- \'\' `` ` \' <code>in code</code>. <accent 
type="tilde" bracketed="off">e</accent>.
 </pre></example>
 ';

Index: t/results/converters_tests/normal_font_in_monospace.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/normal_font_in_monospace.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/converters_tests/normal_font_in_monospace.pl      23 Aug 2012 
18:14:34 -0000      1.2
+++ t/results/converters_tests/normal_font_in_monospace.pl      3 Sep 2012 
21:58:42 -0000       1.3
@@ -274,7 +274,7 @@
 </p>';
 
 
-$result_converted{'xml'}->{'normal_font_in_monospace'} = '<example>
+$result_converted{'xml'}->{'normal_font_in_monospace'} = '<example endspaces=" 
">
 <pre xml:space="preserve">in example <r>in r&textmdash;now <code>in 
co---de</code></r>
 </pre></example>
 

Index: t/results/converters_tests/raw_block_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/raw_block_commands.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/converters_tests/raw_block_commands.pl    23 Aug 2012 18:14:34 
-0000      1.2
+++ t/results/converters_tests/raw_block_commands.pl    3 Sep 2012 21:58:42 
-0000       1.3
@@ -500,17 +500,17 @@
 
 
 $result_converted{'xml'}->{'raw_block_commands'} = '
-<html>
+<html endspaces=" ">
 &lt;blink&gt;html&lt;/blink&gt; &textldquo;}
 </html>
 
 <para>xml</para> ``}
 
-<docbook>
+<docbook endspaces=" ">
 &lt;emphasis&gt;docbook&lt;/emphasis&gt; &textldquo;}
 </docbook>
 
-<tex>
+<tex endspaces=" ">
 $\\underline{a &lt; b <code>tex \\hbox{ code }</code>}$ &textldquo;}
 </tex>
 ';

Index: t/results/converters_tests/raw_block_commands_expand_tex.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/converters_tests/raw_block_commands_expand_tex.pl 23 Aug 2012 
18:14:35 -0000      1.3
+++ t/results/converters_tests/raw_block_commands_expand_tex.pl 3 Sep 2012 
21:58:42 -0000       1.4
@@ -515,15 +515,15 @@
 
 
 $result_converted{'xml'}->{'raw_block_commands_expand_tex'} = '
-<html>
+<html endspaces=" ">
 &lt;blink&gt;html&lt;/blink&gt; &textldquo;}
 </html>
 
-<xml>
+<xml endspaces=" ">
 &lt;para&gt;xml&lt;/para&gt; &textldquo;}
 </xml>
 
-<docbook>
+<docbook endspaces=" ">
 &lt;emphasis&gt;docbook&lt;/emphasis&gt; &textldquo;}
 </docbook>
 

Index: t/results/converters_tests/ref_in_sectioning.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/converters_tests/ref_in_sectioning.pl     27 Aug 2012 22:04:36 
-0000      1.12
+++ t/results/converters_tests/ref_in_sectioning.pl     3 Sep 2012 21:58:42 
-0000       1.13
@@ -3221,7 +3221,7 @@
 <node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>for example 
<ref><xrefnodename>node</xrefnodename></ref> 
(<pxref><xrefnodename>node</xrefnodename></pxref>) 
(<pxref><xrefnodename>Top</xrefnodename><xrefinfofile spaces=" 
">file</xrefinfofile><xrefprintedname spaces=" 
">Manual</xrefprintedname></pxref>)</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chap</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/converters_tests/some_at_commands_in_ref_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/converters_tests/some_at_commands_in_ref_nodes.pl 27 Aug 2012 
22:04:36 -0000      1.7
+++ t/results/converters_tests/some_at_commands_in_ref_nodes.pl 3 Sep 2012 
21:58:42 -0000       1.8
@@ -1774,7 +1774,7 @@
 <node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">A 
<sc>sc <accent type="tilde" bracketed="off">n</accent> &aring; &tex;</sc> node 
<accent type="uml" bracketed="off">i</accent> <accent 
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent 
type="macr" bracketed="off">E</accent></accent> &lslash; <accent 
type="cedil"><accent type="acute" bracketed="off">C</accent></accent> 
&iexcl;</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>Top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">A <sc>sc <accent 
type="tilde" bracketed="off">n</accent> &aring; &tex;</sc> node <accent 
type="uml" bracketed="off">i</accent> <accent 
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent 
type="macr" bracketed="off">E</accent></accent> &lslash; <accent 
type="cedil"><accent type="acute" bracketed="off">C</accent></accent> 
&iexcl;</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/converters_tests/sp_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/sp_in_example.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/sp_in_example.pl 26 Aug 2012 14:15:16 -0000      
1.5
+++ t/results/converters_tests/sp_in_example.pl 3 Sep 2012 21:58:42 -0000       
1.6
@@ -505,7 +505,7 @@
 ';
 
 
-$result_converted{'xml'}->{'sp_in_example'} = '<example>
+$result_converted{'xml'}->{'sp_in_example'} = '<example endspaces=" ">
 <pre xml:space="preserve">Para
 <sp value="1" line=" 1"></sp>
 other para

Index: t/results/converters_tests/spaces_in_empty_node_names.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/spaces_in_empty_node_names.pl    27 Aug 2012 
22:04:37 -0000      1.5
+++ t/results/converters_tests/spaces_in_empty_node_names.pl    3 Sep 2012 
21:58:42 -0000       1.6
@@ -1101,7 +1101,7 @@
 
 $result_converted{'xml'}->{'spaces_in_empty_node_names'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::"><spacecmd 
type="spc"/><spacecmd type="spc"/></menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><verb delimiter=":">  </verb></menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::"><spacecmd type="spc"/></menunode><menudescription><pre 
xml:space="preserve">

Index: t/results/converters_tests/spaces_in_node_names.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/spaces_in_node_names.pl  27 Aug 2012 22:04:37 
-0000      1.5
+++ t/results/converters_tests/spaces_in_node_names.pl  3 Sep 2012 21:58:43 
-0000       1.6
@@ -1188,7 +1188,7 @@
 
 $result_converted{'xml'}->{'spaces_in_node_names'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">a<spacecmd 
type="spc"/><spacecmd type="spc"/></nodenext><nodeup 
automatic="on">(dir)</nodeup></node>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">a<spacecmd 
type="spc"/><spacecmd type="spc"/></menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">b<verb delimiter=":">  </verb></menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">c<spacecmd type="spc"/></menunode><menudescription><pre 
xml:space="preserve">

Index: t/results/converters_tests/table_in_display_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/table_in_display_in_example.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/table_in_display_in_example.pl   27 Aug 2012 
00:38:46 -0000      1.4
+++ t/results/converters_tests/table_in_display_in_example.pl   3 Sep 2012 
21:58:43 -0000       1.5
@@ -393,9 +393,9 @@
 ';
 
 
-$result_converted{'xml'}->{'table_in_display_in_example'} = '<example>
-<display>
-<table commandarg="asis" spaces=" ">
+$result_converted{'xml'}->{'table_in_display_in_example'} = '<example 
endspaces=" ">
+<display endspaces=" ">
+<table commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat 
command="asis">item</itemformat></item>
 </tableterm><tableitem><pre xml:space="preserve">Line
 </pre></tableitem></tableentry></table>

Index: t/results/converters_tests/table_in_example_in_display.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/table_in_example_in_display.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/table_in_example_in_display.pl   27 Aug 2012 
00:38:46 -0000      1.4
+++ t/results/converters_tests/table_in_example_in_display.pl   3 Sep 2012 
21:58:43 -0000       1.5
@@ -393,9 +393,9 @@
 ';
 
 
-$result_converted{'xml'}->{'table_in_example_in_display'} = '<display>
-<example>
-<table commandarg="asis" spaces=" ">
+$result_converted{'xml'}->{'table_in_example_in_display'} = '<display 
endspaces=" ">
+<example endspaces=" ">
+<table commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat 
command="asis">item</itemformat></item>
 </tableterm><tableitem><pre xml:space="preserve">Line
 </pre></tableitem></tableentry></table>

Index: t/results/converters_tests/test_deftypefnnewline.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/converters_tests/test_deftypefnnewline.pl 26 Aug 2012 14:15:17 
-0000      1.7
+++ t/results/converters_tests/test_deftypefnnewline.pl 3 Sep 2012 21:58:43 
-0000       1.8
@@ -1075,21 +1075,21 @@
 <deftypefnnewline value="on" line=" on"></deftypefnnewline>
 
 <node name="Top" spaces=" "><nodename>Top</nodename><nodeup 
automatic="on">(dir)</nodeup></node>
-<deftypefun spaces=" "><definitionterm><indexterm 
index="fn">name</indexterm><defcategory automatic="on">Function</defcategory> 
<deftype>data-type</deftype> <deffunction>name</deffunction> 
<defparamtype>arguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">name</indexterm><defcategory automatic="on">Function</defcategory> 
<deftype>data-type</deftype> <deffunction>name</deffunction> 
<defparamtype>arguments...</defparamtype></definitionterm>
 <definitionitem><para>aaa
 </para></definitionitem></deftypefun>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">arg</indexterm><defcategory>fun</defcategory> 
<deffunction>arg</deffunction></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">arg</indexterm><defcategory>fun</defcategory> 
<deffunction>arg</deffunction></definitionterm>
 <definitionitem><para>fff
 </para></definitionitem></deffn>
 
 <deftypefnnewline value="off" line=" off"></deftypefnnewline>
 
-<deftypefun spaces=" "><definitionterm><indexterm 
index="fn">name2</indexterm><defcategory automatic="on">Function</defcategory> 
<deftype>data-type2</deftype> <deffunction>name2</deffunction> 
<defparamtype>arguments2...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">name2</indexterm><defcategory automatic="on">Function</defcategory> 
<deftype>data-type2</deftype> <deffunction>name2</deffunction> 
<defparamtype>arguments2...</defparamtype></definitionterm>
 <definitionitem><para>aaa2
 </para></definitionitem></deftypefun>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">arg2</indexterm><defcategory>fun2</defcategory> 
<deffunction>arg2</deffunction></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">arg2</indexterm><defcategory>fun2</defcategory> 
<deffunction>arg2</deffunction></definitionterm>
 <definitionitem><para>fff2
 </para></definitionitem></deffn>
 ';

Index: t/results/converters_tests/things_before_setfilename.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/converters_tests/things_before_setfilename.pl     27 Aug 2012 
22:04:37 -0000      1.14
+++ t/results/converters_tests/things_before_setfilename.pl     3 Sep 2012 
21:58:43 -0000       1.15
@@ -1880,14 +1880,14 @@
 <ref><xrefnodename>An anchor</xrefnodename></ref>
 </para></footnote>
 </para>
-<float name="float-anchor" type="" spaces=" "><floatname spaces=" ">float 
anchor</floatname>
+<float name="float-anchor" type="" spaces=" " endspaces=" "><floatname 
spaces=" ">float anchor</floatname>
 <para>In float
 </para></float>
 
 <para>Ref to float
 <ref><xrefnodename>float anchor</xrefnodename></ref>.
 </para>
-<float name="ta" type="Text" spaces=" "><floattype>Text</floattype><floatname 
spaces=" ">ta</floatname>
+<float name="ta" type="Text" spaces=" " endspaces=" 
"><floattype>Text</floattype><floatname spaces=" ">ta</floatname>
 <para>In float
 </para>
 <caption><para>ta caption</para></caption>
@@ -1895,7 +1895,7 @@
 
 <contents></contents>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::                ">An 
anchor</menunode><menudescription><pre xml:space="preserve">menu entry pointing 
to the anchor.
 </pre></menudescription></menuentry></menu>
 

Index: t/results/converters_tests/things_before_setfilename_no_element.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/converters_tests/things_before_setfilename_no_element.pl  27 Aug 
2012 22:04:37 -0000      1.14
+++ t/results/converters_tests/things_before_setfilename_no_element.pl  3 Sep 
2012 21:58:43 -0000       1.15
@@ -1699,14 +1699,14 @@
 <ref><xrefnodename>An anchor</xrefnodename></ref>
 </para></footnote>
 </para>
-<float name="float-anchor" type="" spaces=" "><floatname spaces=" ">float 
anchor</floatname>
+<float name="float-anchor" type="" spaces=" " endspaces=" "><floatname 
spaces=" ">float anchor</floatname>
 <para>In float
 </para></float>
 
 <para>Ref to float
 <ref><xrefnodename>float anchor</xrefnodename></ref>.
 </para>
-<float name="ta" type="Text" spaces=" "><floattype>Text</floattype><floatname 
spaces=" ">ta</floatname>
+<float name="ta" type="Text" spaces=" " endspaces=" 
"><floattype>Text</floattype><floatname spaces=" ">ta</floatname>
 <para>In float
 </para>
 <caption><para>ta caption</para></caption>
@@ -1714,7 +1714,7 @@
 
 <contents></contents>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::                ">An 
anchor</menunode><menudescription><pre xml:space="preserve">menu entry pointing 
to the anchor.
 </pre></menudescription></menuentry></menu>
 

Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- t/results/coverage/block_commands.pl        27 Aug 2012 22:04:37 -0000      
1.50
+++ t/results/coverage/block_commands.pl        3 Sep 2012 21:58:43 -0000       
1.51
@@ -582,15 +582,15 @@
 
 
 $result_converted{'xml'}->{'block_commands'} = '
-<group>
+<group endspaces=" ">
 <para>in group
 </para></group>
 
-<quotation spaces=" "><quotationtype>warning</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>warning</quotationtype>
 <para>in quotation
 </para></quotation>
 
-<float name="b-float" type="a-float" spaces=" "><floattype>a 
float</floattype><floatname spaces=" ">b float</floatname>
+<float name="b-float" type="a-float" spaces=" " endspaces=" "><floattype>a 
float</floattype><floatname spaces=" ">b float</floatname>
 <para>In float
 </para>
 

Index: t/results/coverage/cartouche.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/cartouche.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/coverage/cartouche.pl     23 Aug 2012 18:14:36 -0000      1.16
+++ t/results/coverage/cartouche.pl     3 Sep 2012 21:58:43 -0000       1.17
@@ -117,7 +117,7 @@
 ';
 
 
-$result_converted{'xml'}->{'cartouche'} = '<cartouche>
+$result_converted{'xml'}->{'cartouche'} = '<cartouche endspaces=" ">
 <para>in cartouche.
 </para></cartouche>';
 

Index: t/results/coverage/cartouche_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/cartouche_in_example.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage/cartouche_in_example.pl  23 Aug 2012 18:14:36 -0000      
1.7
+++ t/results/coverage/cartouche_in_example.pl  3 Sep 2012 21:58:43 -0000       
1.8
@@ -241,9 +241,9 @@
 ';
 
 
-$result_converted{'xml'}->{'cartouche_in_example'} = '<example>
+$result_converted{'xml'}->{'cartouche_in_example'} = '<example endspaces=" ">
 <pre xml:space="preserve">In example
-</pre><cartouche>
+</pre><cartouche endspaces=" ">
 <pre xml:space="preserve">In cartouche in example
 </pre></cartouche>
 <pre xml:space="preserve">end example

Index: t/results/coverage/cartouche_in_quotation.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/cartouche_in_quotation.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/cartouche_in_quotation.pl        23 Aug 2012 18:14:36 
-0000      1.12
+++ t/results/coverage/cartouche_in_quotation.pl        3 Sep 2012 21:58:43 
-0000       1.13
@@ -241,9 +241,9 @@
 ';
 
 
-$result_converted{'xml'}->{'cartouche_in_quotation'} = '<quotation>
+$result_converted{'xml'}->{'cartouche_in_quotation'} = '<quotation endspaces=" 
">
 <para>In quotation
-</para><cartouche>
+</para><cartouche endspaces=" ">
 <para>In cartouche in quotation
 </para></cartouche>
 <para>end quotation

Index: t/results/coverage/comment_on_cartouche_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/comment_on_cartouche_line.pl     24 Aug 2012 16:43:19 
-0000      1.13
+++ t/results/coverage/comment_on_cartouche_line.pl     3 Sep 2012 21:58:43 
-0000       1.14
@@ -147,7 +147,7 @@
 ';
 
 
-$result_converted{'xml'}->{'comment_on_cartouche_line'} = '<cartouche spaces=" 
"><!-- c comment -->
+$result_converted{'xml'}->{'comment_on_cartouche_line'} = '<cartouche spaces=" 
" endspaces=" "><!-- c comment -->
 <para>in cartouche.
 </para></cartouche>
 ';

Index: t/results/coverage/comment_on_group_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/comment_on_group_line.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/comment_on_group_line.pl 24 Aug 2012 16:43:19 -0000      
1.13
+++ t/results/coverage/comment_on_group_line.pl 3 Sep 2012 21:58:43 -0000       
1.14
@@ -145,7 +145,7 @@
 </p>';
 
 
-$result_converted{'xml'}->{'comment_on_group_line'} = '<group spaces=" "><!-- 
c comment -->
+$result_converted{'xml'}->{'comment_on_group_line'} = '<group spaces=" " 
endspaces=" "><!-- c comment -->
 <para>in group.
 </para></group>
 ';

Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- t/results/coverage/def.pl   26 Aug 2012 14:15:24 -0000      1.67
+++ t/results/coverage/def.pl   3 Sep 2012 21:58:43 -0000       1.68
@@ -2620,15 +2620,15 @@
 
 
 $result_converted{'xml'}->{'def'} = '
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">d--effn_name</indexterm><defcategory 
bracketed="on">c--ategory</defcategory> <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d--effn_name</indexterm><defcategory 
bracketed="on">c--ategory</defcategory> <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;effn
 </para></definitionitem></deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">de--ffn_name</indexterm><defcategory>cate--gory</defcategory> 
<deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">de--ffn_name</indexterm><defcategory>cate--gory</defcategory> 
<deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
 <definitionitem><para>def&textndash;fn
 </para></definitionitem></deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap1</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>

Index: t/results/coverage/exdent_and_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_commands.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/coverage/exdent_and_commands.pl   24 Aug 2012 16:43:19 -0000      
1.17
+++ t/results/coverage/exdent_and_commands.pl   3 Sep 2012 21:58:43 -0000       
1.18
@@ -578,14 +578,14 @@
 ';
 
 
-$result_converted{'xml'}->{'exdent_and_commands'} = '<quotation>
+$result_converted{'xml'}->{'exdent_and_commands'} = '<quotation endspaces=" ">
 <para>quotation1
 </para><exdent spaces=" ">in exdented protected eol <spacecmd 
type="nl"/></exdent><para>following
 </para><exdent spaces=" ">in exdented a &arobase;* &linebreak; and 
following</exdent>
 <para>after exdented
 </para></quotation>
 
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">example
 </pre><exdent spaces=" ">in exdented protected eol <spacecmd 
type="nl"/></exdent><pre xml:space="preserve">following
 </pre><exdent spaces=" ">in exdented a &arobase;* &linebreak; and 
following</exdent>

Index: t/results/coverage/exdent_and_formats.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/coverage/exdent_and_formats.pl    24 Aug 2012 16:43:19 -0000      
1.20
+++ t/results/coverage/exdent_and_formats.pl    3 Sep 2012 21:58:43 -0000       
1.21
@@ -2475,7 +2475,7 @@
 ';
 
 
-$result_converted{'xml'}->{'exdent_and_formats'} = '<example>
+$result_converted{'xml'}->{'exdent_and_formats'} = '<example endspaces=" ">
 <pre xml:space="preserve"> Example   Hoho. &tex; . &linebreak; &arobase;.
 
 </pre><exdent spaces=" ">Other line</exdent>
@@ -2483,7 +2483,7 @@
 </pre></example>
 
 
-<example>
+<example endspaces=" ">
 <exdent spaces=" ">exdented  and dash --- in example</exdent>
 <pre xml:space="preserve">Not exdented
 </pre><exdent spaces=" ">exdented</exdent>
@@ -2492,7 +2492,7 @@
 
 <para>Para1.
 </para>
-<quotation>
+<quotation endspaces=" ">
 <para>qsddsqkdsqkkmljsqjsqodmmdsqdsmqj dqs sdq sqd sdq dsq sdq sqd sqd sdq sdq 
 qsd dsq sdq dsq dssdq sdq sdq sdq dsq sdq dsq dsq sdq dsq sdqsd q
 </para></quotation>
@@ -2503,55 +2503,55 @@
 </para>
 <para>Last para.
 </para>
-<quotation>
+<quotation endspaces=" ">
 <para>quotation1
 quotation2
 </para></quotation>
 
-<quotation>
+<quotation endspaces=" ">
 <para>quotation para 1
 </para>
 <para>quotation para 2
 </para></quotation>
 
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">Example   Hoho.
-</pre><example>
+</pre><example endspaces=" ">
 <pre xml:space="preserve">Nested Other line
 </pre><exdent spaces=" ">exdented nested other line</exdent>
 </example>
 </example>
 
-<quotation>
+<quotation endspaces=" ">
 <exdent spaces=" ">exdented quotation line   and dash &textmdash; in 
quotation</exdent>
 </quotation>
 
-<quotation>
+<quotation endspaces=" ">
 <para>Not exdented followed by exdented
 </para><exdent spaces="  ">exdented quotation line</exdent>
 </quotation>
 
-<quotation>
+<quotation endspaces=" ">
 <exdent spaces="  ">exdented quotation line</exdent>
 <para>Followed by not exdented 
 </para></quotation>
 
-<quotation>
+<quotation endspaces=" ">
 <exdent spaces=" ">exdented quotation line oidfjslsd aez a aze azaz aeae za 
eaz az</exdent>
 <exdent spaces=" ">azeaz az az az az</exdent>
 </quotation>
 
-<quotation>
+<quotation endspaces=" ">
 <exdent spaces=" ">exdented quotation line oidfjslsd aez a aze azaz aeae za 
eaz az azeaz end line</exdent>
 <exdent spaces=" ">az az az az</exdent>
 </quotation>
 
-<quotation>
+<quotation endspaces=" ">
 <para>quotation line oidfjslsd aez a aze azaz aeae za eaz az zelef  aaa
 </para><exdent spaces=" ">ezkfjklezf </exdent>
 </quotation>
 
-<quotation>
+<quotation endspaces=" ">
 <exdent spaces=" ">very loooooooooooooooooooooooooooooooooong exdented 
quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz end line</exdent>
 <exdent spaces=" ">az az az az</exdent>
 </quotation>

Index: t/results/coverage/flushleft_flushright.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/coverage/flushleft_flushright.pl  23 Aug 2012 18:14:37 -0000      
1.16
+++ t/results/coverage/flushleft_flushright.pl  3 Sep 2012 21:58:43 -0000       
1.17
@@ -338,7 +338,7 @@
 
 
 $result_converted{'xml'}->{'flushleft_flushright'} = '
-<flushleft>
+<flushleft endspaces=" ">
 <para>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
 ldskf dsflj
      lklsdlv l    lll. Bbb.
@@ -346,7 +346,7 @@
 <para>lhds
 </para></flushleft>
 
-<flushright>
+<flushright endspaces=" ">
 <para>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
 ldskf dsflj
      lklsdlv l    lll. Bbb.

Index: t/results/coverage/flushleft_flushright_in_quotation.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/flushleft_flushright_in_quotation.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/coverage/flushleft_flushright_in_quotation.pl     23 Aug 2012 
18:14:37 -0000      1.17
+++ t/results/coverage/flushleft_flushright_in_quotation.pl     3 Sep 2012 
21:58:43 -0000       1.18
@@ -336,12 +336,12 @@
 
 
 $result_converted{'xml'}->{'flushleft_flushright_in_quotation'} = '
-<quotation>
-<flushleft>
+<quotation endspaces=" ">
+<flushleft endspaces=" ">
    <para>f l
 </para></flushleft>
 
-<flushright>
+<flushright endspaces=" ">
   <para>f r
 </para></flushright>
 </quotation>

Index: t/results/coverage/flushright_example_nested.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/flushright_example_nested.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/flushright_example_nested.pl     23 Aug 2012 18:14:37 
-0000      1.13
+++ t/results/coverage/flushright_example_nested.pl     3 Sep 2012 21:58:44 
-0000       1.14
@@ -426,15 +426,15 @@
 ';
 
 
-$result_converted{'xml'}->{'flushright_example_nested'} = '<example>
-<flushright>
+$result_converted{'xml'}->{'flushright_example_nested'} = '<example 
endspaces=" ">
+<flushright endspaces=" ">
 <pre xml:space="preserve">in   --- flushright
 
 </pre></flushright>
 </example>
 
-<flushright>
-<example>
+<flushright endspaces=" ">
+<example endspaces=" ">
 <pre xml:space="preserve">in   --- example
 
 flush then example

Index: t/results/coverage/insertcopying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/insertcopying.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/coverage/insertcopying.pl 23 Aug 2012 18:14:37 -0000      1.18
+++ t/results/coverage/insertcopying.pl 3 Sep 2012 21:58:44 -0000       1.19
@@ -287,10 +287,10 @@
 ';
 
 
-$result_converted{'xml'}->{'insertcopying'} = '<copying>
+$result_converted{'xml'}->{'insertcopying'} = '<copying endspaces=" ">
 <para>License.
 </para>
-<quotation> 
+<quotation endspaces=" "> 
 <para>You are not allowed.
 </para></quotation>
 </copying>

Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- t/results/coverage/item_container.pl        29 Aug 2012 07:32:07 -0000      
1.52
+++ t/results/coverage/item_container.pl        3 Sep 2012 21:58:44 -0000       
1.53
@@ -512,16 +512,16 @@
 
 
 $result_converted{'xml'}->{'item_container'} = '
-<itemize spaces=" "><itemprepend>+</itemprepend>
+<itemize spaces=" " endspaces=" "><itemprepend>+</itemprepend>
 <listitem spaces=" "><prepend>+</prepend><para>i&textndash;tem +
 </para></listitem></itemize>
 
-<itemize commandarg="bullet" spaces=" "><itemprepend><formattingcommand 
command="bullet" /></itemprepend>
+<itemize commandarg="bullet" spaces=" " endspaces=" 
"><itemprepend><formattingcommand command="bullet" /></itemprepend>
 <listitem><prepend>&bullet;</prepend>
  <para>b&textndash;ullet
 </para></listitem></itemize>
 
-<itemize commandarg="bullet">
+<itemize commandarg="bullet" endspaces=" ">
 <listitem spaces=" "><prepend>&bullet;</prepend><para>no itemize argument
 </para></listitem></itemize>
 ';

Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- t/results/coverage/multitable.pl    27 Aug 2012 00:38:46 -0000      1.57
+++ t/results/coverage/multitable.pl    3 Sep 2012 21:58:44 -0000       1.58
@@ -876,7 +876,7 @@
 
 
 $result_converted{'xml'}->{'multitable'} = '
-<multitable spaces=" "><columnfractions line=" 0.6 0.4"><columnfraction 
value="0.6"></columnfraction><columnfraction 
value="0.4"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions line=" 0.6 
0.4"><columnfraction value="0.6"></columnfraction><columnfraction 
value="0.4"></columnfraction></columnfractions>
 <thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable 
headitem </para></entry><entry command="tab" spaces=" "><para>another tab
 </para></entry></row></thead><tbody><row><entry command="item" spaces=" 
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces=" 
"><para>multitable tab
 <!-- c comment in multitable -->
@@ -885,7 +885,7 @@
 </para></entry></row><row><entry command="item" spaces=" "><para>lone 
mu&textndash;ltitable item
 </para></entry></row></tbody></multitable>
 
-<multitable spaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype> <columnprototype 
bracketed="on">bidule</columnprototype></columnprototypes>
+<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype> <columnprototype 
bracketed="on">bidule</columnprototype></columnprototypes>
 <tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry 
command="tab" spaces=" "><para>bidule
 </para></entry></row></tbody></multitable>
 ';

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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/coverage/nested_block_commands.pl 23 Aug 2012 18:14:38 -0000      
1.28
+++ t/results/coverage/nested_block_commands.pl 3 Sep 2012 21:58:44 -0000       
1.29
@@ -2573,92 +2573,92 @@
 ';
 
 
-$result_converted{'xml'}->{'nested_block_commands'} = '<group>
+$result_converted{'xml'}->{'nested_block_commands'} = '<group endspaces=" ">
 <para>In group
-</para><quotation>
+</para><quotation endspaces=" ">
 <para>in quotation
 </para></quotation>
 </group>
 
-<group>
-<quotation>
+<group endspaces=" ">
+<quotation endspaces=" ">
 <para>in quotation
 </para></quotation>
 </group>
 
-<group>
+<group endspaces=" ">
 <para>In group
-</para><quotation>
+</para><quotation endspaces=" ">
 <para>in quotation
 </para></quotation>
 <para>after quotation
 </para></group>
 
-<group>
+<group endspaces=" ">
 
 <para>In group sp b
-</para><quotation>
+</para><quotation endspaces=" ">
 <para>in quotation
 </para></quotation>
 </group>
 
-<group>
+<group endspaces=" ">
 
 <para>In group sp b a
 </para>
-<quotation>
+<quotation endspaces=" ">
 <para>in quotation
 </para></quotation>
 </group>
 
-<group>
+<group endspaces=" ">
 <para>In group sp a
 </para>
-<quotation>
+<quotation endspaces=" ">
 <para>in quotation
 </para></quotation>
 </group>
 
-<group>
-<quotation>
+<group endspaces=" ">
+<quotation endspaces=" ">
 
 <para>in quotation sp b
 </para></quotation>
 </group>
 
-<group>
-<quotation>
+<group endspaces=" ">
+<quotation endspaces=" ">
 
 <para>in quotation sp b a
 </para>
 </quotation>
 </group>
 
-<group>
-<quotation>
+<group endspaces=" ">
+<quotation endspaces=" ">
 <para>in quotation sp a
 </para>
 </quotation>
 </group>
 
-<group>
-<quotation>
+<group endspaces=" ">
+<quotation endspaces=" ">
 <para>in quotation
 </para></quotation>
 
 <para>After quotation sp b
 </para></group>
 
-<group>
-<quotation>
+<group endspaces=" ">
+<quotation endspaces=" ">
 <para>in quotation
 </para></quotation>
 <para>After quotation sp a
 </para>
 </group>
 
-<group>
-<quotation>
+<group endspaces=" ">
+<quotation endspaces=" ">
 <para>in quotation
 </para></quotation>
 

Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- t/results/coverage/preformatted.pl  27 Aug 2012 00:38:46 -0000      1.59
+++ t/results/coverage/preformatted.pl  3 Sep 2012 21:58:44 -0000       1.60
@@ -491,14 +491,14 @@
 
 
 $result_converted{'xml'}->{'preformatted'} = '
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">e--xample  some  
 
    text
 </pre></example>
 
-<format>
-<vtable commandarg="code" spaces=" ">
+<format endspaces=" ">
+<vtable commandarg="code" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="code"><indexterm 
index="vr">item in table in format</indexterm>item in table in 
format</itemformat></item>
 </tableterm><tableitem><pre xml:space="preserve">
 in table in format

Index: t/results/coverage/punctuation_in_line_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/coverage/punctuation_in_line_commands.pl  27 Aug 2012 22:04:37 
-0000      1.36
+++ t/results/coverage/punctuation_in_line_commands.pl  3 Sep 2012 21:58:44 
-0000       1.37
@@ -1582,21 +1582,21 @@
 <node name="node_0021-After-punc" spaces=" "><nodename>node! After 
punc</nodename></node>
 <top spaces=" "><sectiontitle>top! After punc</sectiontitle>
 
-<table commandarg="asis" spaces=" ">
+<table commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis">item! After 
punc</itemformat></item>
 </tableterm></tableentry></table>
 
-<quotation spaces=" "><quotationtype>quotation arg! After punc</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>quotation arg! After 
punc</quotationtype>
 <para>In quotation
 </para><exdent spaces=" ">exdent quotation! After punc</exdent>
 </quotation>
 
-<float name="float-label_0021-After-punc" type="float-type_0021-After-punc" 
spaces=" "><floattype>float type! After punc</floattype><floatname spaces=" 
">float label! After punc</floatname>
+<float name="float-label_0021-After-punc" type="float-type_0021-After-punc" 
spaces=" " endspaces=" "><floattype>float type! After 
punc</floattype><floatname spaces=" ">float label! After punc</floatname>
 <para>In float
 </para><shortcaption><para>shortcaption! After punc</para></shortcaption>
 </float>
 
-<float name="label-with-caption" type="float-type_0021-After-punc" spaces=" 
"><floattype>float type! After punc</floattype><floatname spaces=" ">label with 
caption</floatname>
+<float name="label-with-caption" type="float-type_0021-After-punc" spaces=" " 
endspaces=" "><floattype>float type! After punc</floattype><floatname spaces=" 
">label with caption</floatname>
 <para>In float with caption.
 </para><caption><para>caption! After punc</para></caption>
 </float>

Index: t/results/coverage/quotation_author.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/coverage/quotation_author.pl      26 Aug 2012 14:15:26 -0000      
1.19
+++ t/results/coverage/quotation_author.pl      3 Sep 2012 21:58:44 -0000       
1.20
@@ -297,7 +297,7 @@
 </div>';
 
 
-$result_converted{'xml'}->{'quotation_author'} = '<quotation>
+$result_converted{'xml'}->{'quotation_author'} = '<quotation endspaces=" ">
 
 <author spaces=" ">First Author</author>
 <para>quotation

Index: t/results/coverage/symbol_after_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/symbol_after_command.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/coverage/symbol_after_command.pl  24 Aug 2012 16:43:20 -0000      
1.16
+++ t/results/coverage/symbol_after_command.pl  3 Sep 2012 21:58:44 -0000       
1.17
@@ -733,7 +733,7 @@
 </p>';
 
 
-$result_converted{'xml'}->{'symbol_after_command'} = '<table commandarg="asis" 
spaces=" ">
+$result_converted{'xml'}->{'symbol_after_command'} = '<table commandarg="asis" 
spaces=" " endspaces=" ">
 <tableentry><tableterm><item><itemformat command="asis">. 
dot</itemformat></item>
 </tableterm></tableentry><tableentry><tableterm><item><itemformat 
command="asis">, comma</itemformat></item>
 </tableterm></tableentry><tableentry><tableterm><item><itemformat 
command="asis">&arobase; &arobase;</itemformat></item>

Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- t/results/coverage/table.pl 27 Aug 2012 00:38:46 -0000      1.61
+++ t/results/coverage/table.pl 3 Sep 2012 21:58:44 -0000       1.62
@@ -844,14 +844,14 @@
 
 
 $result_converted{'xml'}->{'table'} = '
-<table commandarg="asis" spaces=" ">
+<table commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis">table 
item</itemformat></item>
 <itemx spaces=" "><itemformat command="asis">table itemx</itemformat></itemx>
 </tableterm><tableitem>
 <para>In table
 </para></tableitem></tableentry></table>
 
-<vtable commandarg="samp" spaces=" "><!-- c samp -->
+<vtable commandarg="samp" spaces=" " endspaces=" "><!-- c samp -->
 <beforefirstitem><!-- c after vtable -->
 <cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>
 

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.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- t/results/coverage/table_command_comment.pl 27 Aug 2012 00:38:46 -0000      
1.42
+++ t/results/coverage/table_command_comment.pl 3 Sep 2012 21:58:44 -0000       
1.43
@@ -203,7 +203,7 @@
 ';
 
 
-$result_converted{'xml'}->{'table_command_comment'} = '<table 
commandarg="code" spaces=" "><!-- c in comment -->
+$result_converted{'xml'}->{'table_command_comment'} = '<table 
commandarg="code" spaces=" " endspaces=" "><!-- c in comment -->
 <tableentry><tableterm><item spaces=" "><itemformat 
command="code">item</itemformat></item>
 </tableterm></tableentry></table>';
 

Index: t/results/menu/block_commands_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/menu/block_commands_in_menu_description.pl        27 Aug 2012 
00:38:47 -0000      1.9
+++ t/results/menu/block_commands_in_menu_description.pl        3 Sep 2012 
21:58:44 -0000       1.10
@@ -1055,21 +1055,21 @@
 $result_converted{'xml'}->{'block_commands_in_menu_description'} = '<node 
name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">(manual)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">(manual)</menunode><menudescription><pre xml:space="preserve">
-</pre><itemize commandarg="bullet">
+</pre><itemize commandarg="bullet" endspaces=" ">
 <beforefirstitem><pre xml:space="preserve">
 </pre></beforefirstitem><listitem spaces=" "><prepend>&bullet;</prepend><pre 
xml:space="preserve">in item
 
 </pre></listitem></itemize>
-<table commandarg="asis" spaces=" ">
+<table commandarg="asis" spaces=" " endspaces=" ">
 <beforefirstitem><pre xml:space="preserve">
 </pre></beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat 
command="asis">table item</itemformat></item>
 </tableterm><tableitem><pre xml:space="preserve">
 Text.
 
 </pre></tableitem></tableentry></table>
-<pre xml:space="preserve"><html>
+<pre xml:space="preserve"><html endspaces=" ">
 
 &lt;b&gt; in html &lt;/b&gt;
 

Index: t/results/menu/comment_on_menu_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/menu/comment_on_menu_line.pl      26 Aug 2012 23:00:56 -0000      
1.19
+++ t/results/menu/comment_on_menu_line.pl      3 Sep 2012 21:58:44 -0000       
1.20
@@ -576,7 +576,7 @@
 
 $result_converted{'xml'}->{'comment_on_menu_line'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">first</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 
-<menu spaces="  "><!-- c -->
+<menu spaces="  " endspaces=" "><!-- c -->
 <menuentry leadingtext="* "><menunode 
separator="::">first</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/menu/dash_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/dash_in_menu.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/menu/dash_in_menu.pl      26 Aug 2012 23:00:56 -0000      1.23
+++ t/results/menu/dash_in_menu.pl      3 Sep 2012 21:58:45 -0000       1.24
@@ -335,7 +335,7 @@
 
 
 $result_converted{'xml'}->{'dash_in_menu'} = '
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menutitle separator=": 
">entry&textmdash;in</menutitle><menunode separator=".         
">(manual)n---ode</menunode><menudescription><pre 
xml:space="preserve">description &textmdash; in.
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 comment &textmdash; in.

Index: t/results/menu/detailmenu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- t/results/menu/detailmenu.pl        26 Aug 2012 23:00:56 -0000      1.38
+++ t/results/menu/detailmenu.pl        3 Sep 2012 21:58:45 -0000       1.39
@@ -465,10 +465,10 @@
 
 
 $result_converted{'xml'}->{'detailmenu'} = '
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::          ">Copying 
Conditions</menunode><menudescription><pre xml:space="preserve">Your rights.
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
-</pre></menucomment><detailmenu>
+</pre></menucomment><detailmenu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">detailmenu</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 </menu>

Index: t/results/menu/detailmenu_in_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/detailmenu_in_description.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/menu/detailmenu_in_description.pl 26 Aug 2012 23:00:56 -0000      
1.12
+++ t/results/menu/detailmenu_in_description.pl 3 Sep 2012 21:58:45 -0000       
1.13
@@ -440,9 +440,9 @@
 
 
 $result_converted{'xml'}->{'detailmenu_in_description'} = '
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::          ">Copying 
Conditions</menunode><menudescription><pre xml:space="preserve">Your rights.
-</pre></menudescription></menuentry><detailmenu>
+</pre></menudescription></menuentry><detailmenu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">detailmenu</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 </menu>

Index: t/results/menu/detailmenu_on_subnodes.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/menu/detailmenu_on_subnodes.pl    26 Aug 2012 23:00:56 -0000      
1.25
+++ t/results/menu/detailmenu_on_subnodes.pl    3 Sep 2012 21:58:45 -0000       
1.26
@@ -2320,15 +2320,15 @@
 $result_converted{'xml'}->{'detailmenu_on_subnodes'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">chapter</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chapter 2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
-</pre></menucomment><detailmenu>
+</pre></menucomment><detailmenu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">section</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 <menucomment><pre xml:space="preserve">
-</pre></menucomment><detailmenu>
+</pre></menucomment><detailmenu endspaces=" ">
 <menucomment><pre xml:space="preserve">Chap 2
 
 </pre></menucomment><menuentry leadingtext="* "><menunode 
separator="::">section chap 2</menunode><menudescription><pre 
xml:space="preserve">
@@ -2340,7 +2340,7 @@
 <node name="chapter" spaces=" "><nodename>chapter</nodename><nodenext 
automatic="on">chapter 2</nodenext><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>chapter</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">section</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
@@ -2352,7 +2352,7 @@
 <node name="chapter-2" spaces=" "><nodename>chapter 2</nodename><nodeprev 
automatic="on">chapter</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>chapter 2</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">section chap 
2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumberedsec</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/menu/entry_after_detailmenu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/menu/entry_after_detailmenu.pl    26 Aug 2012 23:00:56 -0000      
1.15
+++ t/results/menu/entry_after_detailmenu.pl    3 Sep 2012 21:58:45 -0000       
1.16
@@ -1006,8 +1006,8 @@
 
 $result_converted{'xml'}->{'entry_after_detailmenu'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">first</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 
-<menu>
-<detailmenu>
+<menu endspaces=" ">
+<detailmenu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">second</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 <menucomment><pre xml:space="preserve">
@@ -1015,7 +1015,7 @@
 
 </pre></menucomment><menuentry leadingtext="* "><menunode 
separator="::">first</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
-</pre></menucomment><detailmenu>
+</pre></menucomment><detailmenu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">second</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></detailmenu>
 <menuentry leadingtext="* "><menunode 
separator="::">second</menunode><menudescription><pre xml:space="preserve">

Index: t/results/menu/example_in_menu_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/example_in_menu_comment.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/menu/example_in_menu_comment.pl   26 Aug 2012 23:00:56 -0000      
1.22
+++ t/results/menu/example_in_menu_comment.pl   3 Sep 2012 21:58:45 -0000       
1.23
@@ -443,10 +443,10 @@
 
 
 
-$result_converted{'xml'}->{'example_in_menu_comment'} = '<menu>
+$result_converted{'xml'}->{'example_in_menu_comment'} = '<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">entry</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
-</pre><example>
+</pre><example endspaces=" ">
 <pre xml:space="preserve">in 
 
 example

Index: t/results/menu/example_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/menu/example_in_menu_description.pl       26 Aug 2012 23:00:56 
-0000      1.8
+++ t/results/menu/example_in_menu_description.pl       3 Sep 2012 21:58:45 
-0000       1.9
@@ -605,9 +605,9 @@
 $result_converted{'xml'}->{'example_in_menu_description'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">(manual)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">(manual)</menunode><menudescription><pre xml:space="preserve">
-</pre><example>
+</pre><example endspaces=" ">
 <pre xml:space="preserve">in 
 
 example

Index: t/results/menu/formats_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/menu/formats_in_menu.pl   27 Aug 2012 22:04:44 -0000      1.31
+++ t/results/menu/formats_in_menu.pl   3 Sep 2012 21:58:45 -0000       1.32
@@ -1218,9 +1218,9 @@
 
 $result_converted{'xml'}->{'formats_in_menu'} = '<node name="Top" spaces=" 
"><nodename>Top</nodename><nodenext automatic="on">(gcc)</nodenext><nodeup 
automatic="on">(dir)</nodeup></node>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator=":: 
">(gcc)</menunode><menudescription><pre xml:space="preserve">text
-</pre><table commandarg="asis" spaces=" ">
+</pre><table commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat 
command="asis">item</itemformat></item>
 </tableterm><tableitem><pre xml:space="preserve">* table line::
 </pre></tableitem></tableentry></table>
@@ -1232,7 +1232,7 @@
 </verbatim>
 
 <pre xml:space="preserve"></pre></menudescription></menuentry><menuentry 
leadingtext="* "><menunode separator=":: 
">(manual2)</menunode><menudescription><pre xml:space="preserve">%
-<html>
+<html endspaces=" ">
 
 &lt;i&gt;&lt;/i&gt;
 </html>
@@ -1240,7 +1240,7 @@
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator=":: ">(truc)</menunode><menudescription><pre 
xml:space="preserve"><acronym><acronymword>description
 * acronym::</acronymword></acronym>
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
-</pre><example>
+</pre><example endspaces=" ">
 <pre xml:space="preserve">* subsubsection::
 Menu comment
 </pre></example>

Index: t/results/menu/inlineraw_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/menu/inlineraw_in_menu_description.pl     27 Aug 2012 22:04:45 
-0000      1.10
+++ t/results/menu/inlineraw_in_menu_description.pl     3 Sep 2012 21:58:45 
-0000       1.11
@@ -574,7 +574,7 @@
 $result_converted{'xml'}->{'inlineraw_in_menu_description'} = '<node 
name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">(manual)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">(manual)</menunode><menudescription><pre xml:space="preserve">
 <inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent spaces=" 
">in inline raw
 

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.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/menu/menu_entry_name.pl   26 Aug 2012 23:00:56 -0000      1.37
+++ t/results/menu/menu_entry_name.pl   3 Sep 2012 21:58:45 -0000       1.38
@@ -1202,7 +1202,7 @@
 
 
 
-$result_converted{'xml'}->{'menu_entry_name'} = '<menu>
+$result_converted{'xml'}->{'menu_entry_name'} = '<menu endspaces=" ">
 <menuentry leadingtext="* "><menutitle separator=": 
">a</menutitle><menunode>(f)b
 </menunode><menudescription><pre 
xml:space="preserve"></pre></menudescription></menuentry><menuentry 
leadingtext="* "><menutitle separator=": ">a</menutitle><menunode 
separator=",">(f)b1.c</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode separator=",     
">(f)b2.c</menunode><menudescription><pre xml:space="preserve">

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.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- t/results/menu/menu_entry_name_comment.pl   26 Aug 2012 23:00:56 -0000      
1.38
+++ t/results/menu/menu_entry_name_comment.pl   3 Sep 2012 21:58:45 -0000       
1.39
@@ -733,7 +733,7 @@
 
 
 
-$result_converted{'xml'}->{'menu_entry_name_comment'} = '<menu>
+$result_converted{'xml'}->{'menu_entry_name_comment'} = '<menu endspaces=" ">
 <menuentry leadingtext="* "><menutitle separator=": 
">a</menutitle><menunode>(f)b</menunode><menudescription><pre 
xml:space="preserve"><!-- c c -->
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode>(f)b </menunode><menudescription><pre 
xml:space="preserve"><!-- c c -->
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": ">a</menutitle><menunode 
separator=",">(f)b1c.c</menunode><menudescription><pre 
xml:space="preserve"><!-- 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.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- t/results/menu/menu_entry_no_entry.pl       26 Aug 2012 23:00:56 -0000      
1.35
+++ t/results/menu/menu_entry_no_entry.pl       3 Sep 2012 21:58:45 -0000       
1.36
@@ -352,7 +352,7 @@
 
 
 
-$result_converted{'xml'}->{'menu_entry_no_entry'} = '<menu>
+$result_converted{'xml'}->{'menu_entry_no_entry'} = '<menu endspaces=" ">
 <menucomment><pre xml:space="preserve">* a1:
 * a2:  
 * a1c:<!-- c c -->

Index: t/results/menu/menu_entry_no_entry_location.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry_location.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/menu/menu_entry_no_entry_location.pl      26 Aug 2012 23:00:56 
-0000      1.16
+++ t/results/menu/menu_entry_no_entry_location.pl      3 Sep 2012 21:58:45 
-0000       1.17
@@ -449,7 +449,7 @@
 
 
 
-$result_converted{'xml'}->{'menu_entry_no_entry_location'} = '<menu>
+$result_converted{'xml'}->{'menu_entry_no_entry_location'} = '<menu 
endspaces=" ">
 <menuentry leadingtext="* "><menunode separator=":: 
">(manual)</menunode><menudescription><pre xml:space="preserve">begin 
description
 * not an entry ?
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator=":: ">(manual)</menunode><menudescription><pre 
xml:space="preserve">an entry

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.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/menu/menu_entry_node.pl   26 Aug 2012 23:00:56 -0000      1.37
+++ t/results/menu/menu_entry_node.pl   3 Sep 2012 21:58:45 -0000       1.38
@@ -531,7 +531,7 @@
 
 
 
-$result_converted{'xml'}->{'menu_entry_node'} = '<menu>
+$result_converted{'xml'}->{'menu_entry_node'} = '<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">(f)a1</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::  ">(f)a2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::         ">(f)a3</menunode><menudescription><pre 
xml:space="preserve">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.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- t/results/menu/menu_entry_node_comments.pl  26 Aug 2012 23:00:56 -0000      
1.38
+++ t/results/menu/menu_entry_node_comments.pl  3 Sep 2012 21:58:45 -0000       
1.39
@@ -556,7 +556,7 @@
 
 
 
-$result_converted{'xml'}->{'menu_entry_node_comments'} = '<menu>
+$result_converted{'xml'}->{'menu_entry_node_comments'} = '<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">(f)a1c</menunode><menudescription><pre xml:space="preserve"><!-- 
c c -->
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::  ">(f)a2c</menunode><menudescription><pre 
xml:space="preserve"><!-- c c -->
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::         ">(f)a3c</menunode><menudescription><pre 
xml:space="preserve">d<!-- c c -->

Index: t/results/menu/menu_in_example.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/menu/menu_in_example.pl   26 Aug 2012 23:00:56 -0000      1.14
+++ t/results/menu/menu_in_example.pl   3 Sep 2012 21:58:45 -0000       1.15
@@ -892,14 +892,14 @@
 
 $result_converted{'xml'}->{'menu_in_example'} = '<node name="Top" spaces=" 
"><nodename>Top</nodename><nodenext automatic="on">(entry)</nodenext><nodeup 
automatic="on">(dir)</nodeup></node>
 
-<example>
-<menu>
+<example endspaces=" ">
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">(entry)</menunode><menudescription><pre xml:space="preserve">
-</pre><cartouche>
+</pre><cartouche endspaces=" ">
 <pre xml:space="preserve">in cartouche in description in menu in example
 </pre></cartouche>
 </menudescription></menuentry><menucomment><pre xml:space="preserve">
-</pre><cartouche>
+</pre><cartouche endspaces=" ">
 <pre xml:space="preserve">in cartouche in menu comment in menu in example
 </pre></cartouche>
 <pre xml:space="preserve">

Index: t/results/menu/menu_pointing_to_anchor.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/menu/menu_pointing_to_anchor.pl   27 Aug 2012 22:04:45 -0000      
1.11
+++ t/results/menu/menu_pointing_to_anchor.pl   3 Sep 2012 21:58:45 -0000       
1.12
@@ -571,7 +571,7 @@
 </para>
 <anchor name="An-anchor">An anchor</anchor>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::                ">An 
anchor</menunode><menudescription><pre xml:space="preserve">menu entry pointing 
to the anchor.
 </pre></menudescription></menuentry></menu>
 </top>

Index: t/results/menu/menu_title_before_entries.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/menu/menu_title_before_entries.pl 26 Aug 2012 23:00:57 -0000      
1.20
+++ t/results/menu/menu_title_before_entries.pl 3 Sep 2012 21:58:45 -0000       
1.21
@@ -494,7 +494,7 @@
 
 $result_converted{'xml'}->{'menu_title_before_entries'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">subnode</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 
-<menu>
+<menu endspaces=" ">
 <menucomment><pre xml:space="preserve">Horizontal space
 </pre></menucomment><menuentry leadingtext="* "><menunode 
separator="::">subnode</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/menu/no_colon_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/menu/no_colon_in_menu.pl  26 Aug 2012 23:00:57 -0000      1.16
+++ t/results/menu/no_colon_in_menu.pl  3 Sep 2012 21:58:46 -0000       1.17
@@ -318,7 +318,7 @@
 
 $result_converted{'xml'}->{'no_colon_in_menu'} = '<node name="Top" spaces=" 
"><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
 
-<menu>
+<menu endspaces=" ">
 <menucomment><pre xml:space="preserve">* a
 </pre></menucomment></menu>
 ';

Index: t/results/menu/reference_to_external_manual.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/menu/reference_to_external_manual.pl      26 Aug 2012 23:00:57 
-0000      1.28
+++ t/results/menu/reference_to_external_manual.pl      3 Sep 2012 21:58:46 
-0000       1.29
@@ -400,7 +400,7 @@
 $result_converted{'xml'}->{'reference_to_external_manual'} = '
 <node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">(info)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">(info)</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 ';

Index: t/results/menu/sc_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/menu/sc_in_menu.pl        26 Aug 2012 23:00:57 -0000      1.12
+++ t/results/menu/sc_in_menu.pl        3 Sep 2012 21:58:46 -0000       1.13
@@ -1318,12 +1318,12 @@
 $result_converted{'xml'}->{'sc_in_menu'} = '
 <node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on"><sc>node</sc></nodenext><nodeup 
automatic="on">(dir)</nodeup></node>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menutitle 
separator=":"><sc>value</sc></menutitle><menunode separator=".   
"><sc>node</sc></menunode><menudescription><pre 
xml:space="preserve"><sc>descrip tion</sc>
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 <sc>menu comment</sc>
 
-</pre><example>
+</pre><example endspaces=" ">
 <pre xml:space="preserve">* <sc>menu-example value</sc>:(dir)<sc>menu-example 
node</sc>.   <sc>menu-example descrip tion</sc>
 
 <sc>menu-example comment</sc>
@@ -1332,8 +1332,8 @@
 
 <node name="NODE" spaces=" "><nodename><sc>node</sc></nodename><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 
-<example>
-<menu>
+<example endspaces=" ">
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menutitle separator=":"><sc>example 
value</sc></menutitle><menunode separator=".   ">(dir)<sc>example 
node</sc></menunode><menudescription><pre xml:space="preserve"><sc>example 
descrip tion</sc>
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 <sc>example comment</sc>

Index: t/results/menu/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple.pl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- t/results/menu/simple.pl    26 Aug 2012 23:00:57 -0000      1.41
+++ t/results/menu/simple.pl    3 Sep 2012 21:58:46 -0000       1.42
@@ -743,7 +743,7 @@
 $result_converted{'xml'}->{'simple'} = '
 <para>Before menu.
 </para>
-<menu>
+<menu endspaces=" ">
 <menucomment><pre xml:space="preserve">comment
 </pre></menucomment><menuentry leadingtext="* "><menutitle separator=": ">menu 
entry name </menutitle><menunode separator=".    
">node</menunode><menudescription><pre xml:space="preserve">description
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::                ">node name</menunode><menudescription><pre 
xml:space="preserve">description new

Index: t/results/menu/simple_no_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple_no_menu.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/menu/simple_no_menu.pl    26 Aug 2012 23:00:57 -0000      1.17
+++ t/results/menu/simple_no_menu.pl    3 Sep 2012 21:58:46 -0000       1.18
@@ -694,7 +694,7 @@
 $result_converted{'xml'}->{'simple_no_menu'} = '
 <para>Before menu.
 </para>
-<menu>
+<menu endspaces=" ">
 <menucomment><pre xml:space="preserve">comment
 </pre></menucomment><menuentry leadingtext="* "><menutitle separator=": ">menu 
entry name </menutitle><menunode separator=".    
">node</menunode><menudescription><pre xml:space="preserve">description
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::                ">node name</menunode><menudescription><pre 
xml:space="preserve">description new

Index: t/results/menu/verb_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/menu/verb_in_menu_description.pl  26 Aug 2012 23:00:57 -0000      
1.8
+++ t/results/menu/verb_in_menu_description.pl  3 Sep 2012 21:58:46 -0000       
1.9
@@ -538,7 +538,7 @@
 $result_converted{'xml'}->{'verb_in_menu_description'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">(manual)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">(manual)</menunode><menudescription><pre xml:space="preserve">
 <verb delimiter=":"> in verb
 

Index: t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/misc_commands/comment_space_command_on_line.pl    26 Aug 2012 
14:15:37 -0000      1.29
+++ t/results/misc_commands/comment_space_command_on_line.pl    3 Sep 2012 
21:58:46 -0000       1.30
@@ -1047,9 +1047,9 @@
 
 <printindex value="cp" line=" cp "></printindex><!-- c printindex  -->
 
-<float name="label" type="Text" spaces=" 
"><floattype>Text</floattype><floatname spaces=" ">label</floatname>
+<float name="label" type="Text" spaces=" " endspaces=" 
"><floattype>Text</floattype><floatname spaces=" ">label</floatname>
 <para>float
-</para></float><!-- c end -->
+</para></float> <!-- c end -->
 
 <listoffloats type="Text--" spaces=" ">Text <spacecmd 
type="spc"/></listoffloats><!-- c listoffloats -->
 

Index: t/results/multitable/empty_item_tab.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/multitable/empty_item_tab.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/multitable/empty_item_tab.pl      27 Aug 2012 00:38:47 -0000      
1.11
+++ t/results/multitable/empty_item_tab.pl      3 Sep 2012 21:58:46 -0000       
1.12
@@ -1066,7 +1066,7 @@
 ';
 
 
-$result_converted{'xml'}->{'empty_item_tab'} = '<multitable spaces=" 
"><columnfractions line=" 1.0"><columnfraction 
value="1.0"></columnfraction></columnfractions>
+$result_converted{'xml'}->{'empty_item_tab'} = '<multitable spaces=" " 
endspaces=" "><columnfractions line=" 1.0"><columnfraction 
value="1.0"></columnfraction></columnfractions>
 <tbody><row><entry command="item">
 
 </entry></row><row><entry command="item">
@@ -1074,7 +1074,7 @@
 </para></entry></row><row><entry command="item">
 </entry></row></tbody></multitable>
 
-<multitable spaces=" "><columnfractions line=" 0.5 0.5"><columnfraction 
value="0.5"></columnfraction><columnfraction 
value="0.5"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions line=" 0.5 
0.5"><columnfraction value="0.5"></columnfraction><columnfraction 
value="0.5"></columnfraction></columnfractions>
 <tbody><row><entry command="item">
 
 </entry></row><row><entry command="item">

Index: t/results/multitable/inter_item_commands_in_multitable.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/multitable/inter_item_commands_in_multitable.pl   27 Aug 2012 
00:38:47 -0000      1.21
+++ t/results/multitable/inter_item_commands_in_multitable.pl   3 Sep 2012 
21:58:46 -0000       1.22
@@ -1309,7 +1309,7 @@
 ';
 
 
-$result_converted{'xml'}->{'inter_item_commands_in_multitable'} = '<multitable 
spaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'inter_item_commands_in_multitable'} = '<multitable 
spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype></columnprototypes>
 <beforefirstitem><!-- c comment before first item -->
 
 </beforefirstitem><tbody><row><entry command="item" spaces=" "><para>truc
@@ -1320,7 +1320,7 @@
 <!-- c last comment -->
 </para></entry></row></tbody></multitable>
 
-<multitable spaces=" "><columnfractions line=" 0.6 0.4"><columnfraction 
value="0.6"></columnfraction><columnfraction 
value="0.4"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions line=" 0.6 
0.4"><columnfraction value="0.6"></columnfraction><columnfraction 
value="0.4"></columnfraction></columnfractions>
 <thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable 
headitem </para></entry><entry command="tab" spaces=" "><para>another tab
 </para></entry></row></thead><tbody><row><entry command="item" spaces=" 
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces=" 
"><para>multitable tab
 <!-- c comment in multitable -->
@@ -1329,7 +1329,7 @@
 </para></entry></row><row><entry command="item" spaces=" "><para>lone 
mu&textndash;ltitable item
 </para></entry></row></tbody></multitable>
 
-<multitable spaces=" "><columnprototypes><columnprototype 
bracketed="on">thing</columnprototype></columnprototypes>
+<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">thing</columnprototype></columnprototypes>
 <beforefirstitem><para>Title
 <cindex index="cp"><indexterm index="cp">cindex</indexterm></cindex>
 </para></beforefirstitem><tbody><row><entry command="item" spaces=" 
"><para>thing

Index: t/results/multitable/multitable_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_in_example.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/multitable/multitable_in_example.pl       27 Aug 2012 00:38:47 
-0000      1.17
+++ t/results/multitable/multitable_in_example.pl       3 Sep 2012 21:58:46 
-0000       1.18
@@ -504,8 +504,8 @@
 ';
 
 
-$result_converted{'xml'}->{'multitable_in_example'} = '<example>
-<multitable spaces=" "><columnprototypes><columnprototype 
bracketed="on">AAA</columnprototype>  <columnprototype 
bracketed="on">BBB</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'multitable_in_example'} = '<example endspaces=" ">
+<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">AAA</columnprototype>  <columnprototype 
bracketed="on">BBB</columnprototype></columnprototypes>
 <tbody><row><entry command="item" spaces=" "><pre xml:space="preserve">truc 
</pre></entry><entry command="tab" spaces=" "><pre xml:space="preserve">bidule 
example
 </pre></entry></row><row><entry command="item" spaces=" "><pre 
xml:space="preserve">begin item example
 

Index: t/results/multitable/multitable_with_empty_item_tab.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_with_empty_item_tab.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/multitable/multitable_with_empty_item_tab.pl      27 Aug 2012 
00:38:47 -0000      1.5
+++ t/results/multitable/multitable_with_empty_item_tab.pl      3 Sep 2012 
21:58:46 -0000       1.6
@@ -399,7 +399,7 @@
 ';
 
 
-$result_converted{'xml'}->{'multitable_with_empty_item_tab'} = '<multitable 
spaces=" "><columnfractions line=" 0.3 0.7"><columnfraction 
value="0.3"></columnfraction><columnfraction 
value="0.7"></columnfraction></columnfractions>
+$result_converted{'xml'}->{'multitable_with_empty_item_tab'} = '<multitable 
spaces=" " endspaces=" "><columnfractions line=" 0.3 0.7"><columnfraction 
value="0.3"></columnfraction><columnfraction 
value="0.7"></columnfraction></columnfractions>
 <tbody><row><entry command="item" spaces=" "><para>1-1 </para></entry><entry 
command="tab" spaces=" "><para>1-2 </para></entry></row><row><entry 
command="item"></entry><entry command="tab"></entry></row><row><entry 
command="item" spaces=" "><para>3-1 </para></entry><entry command="tab" 
spaces=" "><para>3-2
 </para></entry></row></tbody></multitable>
 ';

Index: t/results/multitable/not_letters_in_prototype.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/not_letters_in_prototype.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/multitable/not_letters_in_prototype.pl    27 Aug 2012 00:38:47 
-0000      1.1
+++ t/results/multitable/not_letters_in_prototype.pl    3 Sep 2012 21:58:46 
-0000       1.2
@@ -253,7 +253,7 @@
 ';
 
 
-$result_converted{'xml'}->{'not_letters_in_prototype'} = '<multitable spaces=" 
 "><columnprototypes><columnprototype>1.3</columnprototype>  
<columnprototype>5-6</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'not_letters_in_prototype'} = '<multitable spaces=" 
 " endspaces=" "><columnprototypes><columnprototype>1.3</columnprototype>  
<columnprototype>5-6</columnprototype></columnprototypes>
 <tbody><row><entry command="item" spaces=" "><para>1.3 </para></entry><entry 
command="tab" spaces=" "><para>5-6
 </para></entry></row></tbody></multitable>
 ';

Index: t/results/multitable/paragraph_in_cells.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/paragraph_in_cells.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/multitable/paragraph_in_cells.pl  27 Aug 2012 00:38:47 -0000      
1.16
+++ t/results/multitable/paragraph_in_cells.pl  3 Sep 2012 21:58:46 -0000       
1.17
@@ -442,7 +442,7 @@
 ';
 
 
-$result_converted{'xml'}->{'paragraph_in_cells'} = '<multitable spaces=" 
"><columnprototypes><columnprototype bracketed="on">AAA</columnprototype>  
<columnprototype bracketed="on">BBB</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'paragraph_in_cells'} = '<multitable spaces=" " 
endspaces=" "><columnprototypes><columnprototype 
bracketed="on">AAA</columnprototype>  <columnprototype 
bracketed="on">BBB</columnprototype></columnprototypes>
 <tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry 
command="tab" spaces=" "><para>bidule
 </para></entry></row><row><entry command="item" spaces=" "><para>begin item
 </para>

Index: t/results/multitable/prototype_brace_no_brace.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/prototype_brace_no_brace.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/multitable/prototype_brace_no_brace.pl    26 Aug 2012 14:15:46 
-0000      1.5
+++ t/results/multitable/prototype_brace_no_brace.pl    3 Sep 2012 21:58:46 
-0000       1.6
@@ -167,7 +167,7 @@
 $result_converted{'html_text'}->{'prototype_brace_no_brace'} = '';
 
 
-$result_converted{'xml'}->{'prototype_brace_no_brace'} = '<multitable spaces=" 
"><columnprototypes><columnprototype bracketed="on">aa</columnprototype> 
<columnprototype>bb</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'prototype_brace_no_brace'} = '<multitable spaces=" 
" endspaces=" "><columnprototypes><columnprototype 
bracketed="on">aa</columnprototype> 
<columnprototype>bb</columnprototype></columnprototypes>
 </multitable>
 ';
 

Index: t/results/multitable/prototype_brace_no_brace_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/prototype_brace_no_brace_comment.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/multitable/prototype_brace_no_brace_comment.pl    26 Aug 2012 
14:15:47 -0000      1.6
+++ t/results/multitable/prototype_brace_no_brace_comment.pl    3 Sep 2012 
21:58:47 -0000       1.7
@@ -175,7 +175,7 @@
 $result_converted{'html_text'}->{'prototype_brace_no_brace_comment'} = '';
 
 
-$result_converted{'xml'}->{'prototype_brace_no_brace_comment'} = '<multitable 
spaces=" "><columnprototypes><columnprototype 
bracketed="on">aa</columnprototype> 
<columnprototype>bb</columnprototype></columnprototypes><!-- comment cc -->
+$result_converted{'xml'}->{'prototype_brace_no_brace_comment'} = '<multitable 
spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">aa</columnprototype> 
<columnprototype>bb</columnprototype></columnprototypes><!-- comment cc -->
 </multitable>
 ';
 

Index: t/results/multitable/prototype_no_brace.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/prototype_no_brace.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/multitable/prototype_no_brace.pl  26 Aug 2012 14:15:47 -0000      
1.5
+++ t/results/multitable/prototype_no_brace.pl  3 Sep 2012 21:58:47 -0000       
1.6
@@ -197,7 +197,7 @@
 $result_converted{'html_text'}->{'prototype_no_brace'} = '';
 
 
-$result_converted{'xml'}->{'prototype_no_brace'} = '<multitable spaces=" 
"><columnprototypes><columnprototype>aa</columnprototype><columnprototype><var>FF</var></columnprototype>
 <columnprototype>b</columnprototype>    
<columnprototype>cc</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'prototype_no_brace'} = '<multitable spaces=" " 
endspaces=" 
"><columnprototypes><columnprototype>aa</columnprototype><columnprototype><var>FF</var></columnprototype>
 <columnprototype>b</columnprototype>    
<columnprototype>cc</columnprototype></columnprototypes>
 </multitable>
 ';
 

Index: t/results/multitable/w_in_multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/multitable/w_in_multitable.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/multitable/w_in_multitable.pl     27 Aug 2012 00:38:47 -0000      
1.15
+++ t/results/multitable/w_in_multitable.pl     3 Sep 2012 21:58:47 -0000       
1.16
@@ -320,7 +320,7 @@
 ';
 
 
-$result_converted{'xml'}->{'w_in_multitable'} = '<multitable spaces=" 
"><columnprototypes><columnprototype bracketed="on">aaaaaaaaa</columnprototype> 
<columnprototype bracketed="on">bbbbbbbbbbb</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'w_in_multitable'} = '<multitable spaces=" " 
endspaces=" "><columnprototypes><columnprototype 
bracketed="on">aaaaaaaaa</columnprototype> <columnprototype 
bracketed="on">bbbbbbbbbbb</columnprototype></columnprototypes>
 <tbody><row><entry command="item" spaces=" "><para><w>aaaaaaaa
 bbbbbbbbbb</w>
 </para></entry><entry command="tab" spaces=" "><para>gg

Index: t/results/preformatted/caption_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/caption_in_example.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/preformatted/caption_in_example.pl        27 Aug 2012 22:04:46 
-0000      1.17
+++ t/results/preformatted/caption_in_example.pl        3 Sep 2012 21:58:47 
-0000       1.18
@@ -403,9 +403,9 @@
 </screen>';
 
 
-$result_converted{'xml'}->{'caption_in_example'} = '<float type="float" 
spaces=" "><floattype>float</floattype>
+$result_converted{'xml'}->{'caption_in_example'} = '<float type="float" 
spaces=" " endspaces=" "><floattype>float</floattype>
 
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">in example 
 
 </pre><caption><para>caption</para></caption><pre xml:space="preserve">

Index: t/results/preformatted/comment_example_and_blank_lines.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/comment_example_and_blank_lines.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/preformatted/comment_example_and_blank_lines.pl   23 Aug 2012 
18:15:15 -0000      1.3
+++ t/results/preformatted/comment_example_and_blank_lines.pl   3 Sep 2012 
21:58:47 -0000       1.4
@@ -615,24 +615,24 @@
 
 $result_converted{'xml'}->{'comment_example_and_blank_lines'} = '<para>Para.
 </para>
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">comment, blank after <!-- c comment -->
 </pre></example>
 
 <para>Para.
 </para>
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">comment, no blank after <!-- c comment -->
 </pre></example>
 <para>Para.
 </para>
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">no comment, blank after
 </pre></example>
 
 <para>Para.
 </para>
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">no comment, no blank after
 </pre></example>
 <para>Para.

Index: t/results/preformatted/comments_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/comments_in_example.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/preformatted/comments_in_example.pl       23 Aug 2012 18:15:15 
-0000      1.12
+++ t/results/preformatted/comments_in_example.pl       3 Sep 2012 21:58:47 
-0000       1.13
@@ -321,13 +321,13 @@
 
 
 $result_converted{'xml'}->{'comments_in_example'} = '<para>Example with 
comments 2 lines
-</para><example> 
+</para><example endspaces=" "> 
 <pre xml:space="preserve">line <!-- c comment -->
 second line <!-- c comment -->
 </pre></example>
 
 <para>Example with comments 1 line
-</para><example>
+</para><example endspaces=" ">
 <pre xml:space="preserve">line <!-- c comment -->
 </pre></example>
 ';

Index: t/results/preformatted/def_in_example.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/preformatted/def_in_example.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/preformatted/def_in_example.pl    24 Aug 2012 16:43:22 -0000      
1.24
+++ t/results/preformatted/def_in_example.pl    3 Sep 2012 21:58:47 -0000       
1.25
@@ -316,8 +316,8 @@
 </screen></blockquote>';
 
 
-$result_converted{'xml'}->{'def_in_example'} = '<example>
-<defun spaces=" "><definitionterm><indexterm 
index="fn">name</indexterm><defcategory automatic="on">Function</defcategory> 
<deffunction>name</deffunction> <defparam>arg</defparam></definitionterm>
+$result_converted{'xml'}->{'def_in_example'} = '<example endspaces=" ">
+<defun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">name</indexterm><defcategory automatic="on">Function</defcategory> 
<deffunction>name</deffunction> <defparam>arg</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">in defun
 </pre></definitionitem></defun>
 </example>

Index: t/results/preformatted/empty_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/preformatted/empty_line.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/preformatted/empty_line.pl        23 Aug 2012 18:15:15 -0000      
1.20
+++ t/results/preformatted/empty_line.pl        3 Sep 2012 21:58:47 -0000       
1.21
@@ -152,7 +152,7 @@
 </screen>';
 
 
-$result_converted{'xml'}->{'empty_line'} = '<example>
+$result_converted{'xml'}->{'empty_line'} = '<example endspaces=" ">
 <pre xml:space="preserve">example
 
 after empty line

Index: t/results/preformatted/insertcopying_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/insertcopying_in_example.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/preformatted/insertcopying_in_example.pl  23 Aug 2012 18:15:15 
-0000      1.2
+++ t/results/preformatted/insertcopying_in_example.pl  3 Sep 2012 21:58:47 
-0000       1.3
@@ -150,7 +150,7 @@
 </screen>';
 
 
-$result_converted{'xml'}->{'insertcopying_in_example'} = '<example>
+$result_converted{'xml'}->{'insertcopying_in_example'} = '<example endspaces=" 
">
 <insertcopying></insertcopying><pre xml:space="preserve">
 text
 </pre></example>

Index: t/results/preformatted/nested_example_and_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/nested_example_and_comment.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/preformatted/nested_example_and_comment.pl        23 Aug 2012 
18:15:15 -0000      1.11
+++ t/results/preformatted/nested_example_and_comment.pl        3 Sep 2012 
21:58:47 -0000       1.12
@@ -773,25 +773,25 @@
 </screen>';
 
 
-$result_converted{'xml'}->{'nested_example_and_comment'} = '<example>
+$result_converted{'xml'}->{'nested_example_and_comment'} = '<example 
endspaces=" ">
 <pre xml:space="preserve">First line 0 <!-- c -->
-</pre><example>
+</pre><example endspaces=" ">
 <pre xml:space="preserve">Nested example
 </pre></example>
 <pre xml:space="preserve">In first one
 </pre></example>
 
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">First line 1 <!-- c -->
-</pre><example>
+</pre><example endspaces=" ">
 <pre xml:space="preserve">Nested example <!-- c -->
 </pre></example>
 <pre xml:space="preserve">In first one
 </pre></example>
 
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">First line 2 <!-- c -->
-</pre><example>
+</pre><example endspaces=" ">
 <pre xml:space="preserve">Nested example <!-- c -->
 </pre></example>
 <pre xml:space="preserve">In first one <!-- c -->

Index: t/results/preformatted/nested_formats.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/preformatted/nested_formats.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/preformatted/nested_formats.pl    23 Aug 2012 18:15:15 -0000      
1.8
+++ t/results/preformatted/nested_formats.pl    3 Sep 2012 21:58:47 -0000       
1.9
@@ -452,16 +452,16 @@
 </abstract>';
 
 
-$result_converted{'xml'}->{'nested_formats'} = '<format>
-<example>
+$result_converted{'xml'}->{'nested_formats'} = '<format endspaces=" ">
+<example endspaces=" ">
 <pre xml:space="preserve">
 in -- format/example
 
 </pre></example>
 </format>
 
-<example>
-<format>
+<example endspaces=" ">
+<format endspaces=" ">
 <pre xml:space="preserve">
 in -- example/format
 

Index: t/results/preformatted/page_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/page_in_example.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/preformatted/page_in_example.pl   24 Aug 2012 20:42:59 -0000      
1.3
+++ t/results/preformatted/page_in_example.pl   3 Sep 2012 21:58:47 -0000       
1.4
@@ -144,7 +144,7 @@
 </screen>';
 
 
-$result_converted{'xml'}->{'page_in_example'} = '<example>
+$result_converted{'xml'}->{'page_in_example'} = '<example endspaces=" ">
 <page></page>
 <pre xml:space="preserve">text
 </pre></example>

Index: t/results/preformatted/quote_dash_in_display.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_display.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/preformatted/quote_dash_in_display.pl     23 Aug 2012 18:15:15 
-0000      1.11
+++ t/results/preformatted/quote_dash_in_display.pl     3 Sep 2012 21:58:47 
-0000       1.12
@@ -153,7 +153,7 @@
 
 
 $result_converted{'xml'}->{'quote_dash_in_display'} = '
-<display>
+<display endspaces=" ">
 <pre xml:space="preserve">and now &textndash; yes&textmdash;now and 
&textldquo;so&textrdquo;.
 
 </pre></display>

Index: t/results/preformatted/quote_dash_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/quote_dash_in_example.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/preformatted/quote_dash_in_example.pl     23 Aug 2012 18:15:15 
-0000      1.13
+++ t/results/preformatted/quote_dash_in_example.pl     3 Sep 2012 21:58:47 
-0000       1.14
@@ -153,7 +153,7 @@
 
 
 $result_converted{'xml'}->{'quote_dash_in_example'} = '
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">and now -- yes---now and ``so\'\'.
 
 </pre></example>

Index: t/results/preformatted/text_on_command_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/text_on_command_line.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/preformatted/text_on_command_line.pl      24 Aug 2012 16:43:22 
-0000      1.16
+++ t/results/preformatted/text_on_command_line.pl      3 Sep 2012 21:58:47 
-0000       1.17
@@ -575,19 +575,19 @@
 ';
 
 
-$result_converted{'xml'}->{'text_on_command_line'} = '<example spaces=" ">
+$result_converted{'xml'}->{'text_on_command_line'} = '<example spaces=" " 
endspaces=" ">
 </example>
 
-<example spaces=" ">
+<example spaces=" " endspaces=" ">
 <pre xml:space="preserve">normal text
 </pre></example>
 
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">in example
 </pre></example>
 
-<example>
-<example>
+<example endspaces=" ">
+<example endspaces=" ">
 </example>
 </example>
 ';

Index: t/results/preformatted/titlefont_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/preformatted/titlefont_in_example.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/preformatted/titlefont_in_example.pl      27 Aug 2012 22:04:46 
-0000      1.12
+++ t/results/preformatted/titlefont_in_example.pl      3 Sep 2012 21:58:47 
-0000       1.13
@@ -179,7 +179,7 @@
 </screen>';
 
 
-$result_converted{'xml'}->{'titlefont_in_example'} = '<example>
+$result_converted{'xml'}->{'titlefont_in_example'} = '<example endspaces=" ">
 <titlefont>Title</titlefont><pre xml:space="preserve">
 Text.
 </pre></example>

Index: t/results/quotation/comment_on_quotation_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/quotation/comment_on_quotation_line.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/quotation/comment_on_quotation_line.pl    24 Aug 2012 16:43:22 
-0000      1.9
+++ t/results/quotation/comment_on_quotation_line.pl    3 Sep 2012 21:58:47 
-0000       1.10
@@ -166,7 +166,7 @@
 ';
 
 
-$result_converted{'xml'}->{'comment_on_quotation_line'} = '<quotation spaces=" 
"><quotationtype>truc<spacecmd type="spc"/></quotationtype><!-- c quotation  -->
+$result_converted{'xml'}->{'comment_on_quotation_line'} = '<quotation spaces=" 
" endspaces=" "><quotationtype>truc<spacecmd type="spc"/></quotationtype><!-- c 
quotation  -->
 <para>In quotation
 </para></quotation>
 ';

Index: t/results/quotation/empty_quotation.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/quotation/empty_quotation.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/quotation/empty_quotation.pl      24 Aug 2012 16:43:23 -0000      
1.11
+++ t/results/quotation/empty_quotation.pl      3 Sep 2012 21:58:48 -0000       
1.12
@@ -477,16 +477,16 @@
 ';
 
 
-$result_converted{'xml'}->{'empty_quotation'} = '<quotation>
+$result_converted{'xml'}->{'empty_quotation'} = '<quotation endspaces=" ">
 </quotation>
 
-<quotation spaces=" "><quotationtype>Empty</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Empty</quotationtype>
 </quotation>
 
-<quotation spaces=" "><quotationtype><asis></asis></quotationtype>
+<quotation spaces=" " endspaces=" 
"><quotationtype><asis></asis></quotationtype>
 </quotation>
 
-<quotation spaces=" "><quotationtype>&linebreak;</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>&linebreak;</quotationtype>
 </quotation>
 ';
 

Index: t/results/quotation/only_comment_on_quotation_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/quotation/only_comment_on_quotation_line.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/quotation/only_comment_on_quotation_line.pl       24 Aug 2012 
16:43:23 -0000      1.9
+++ t/results/quotation/only_comment_on_quotation_line.pl       3 Sep 2012 
21:58:48 -0000       1.10
@@ -147,7 +147,7 @@
 ';
 
 
-$result_converted{'xml'}->{'only_comment_on_quotation_line'} = '<quotation 
spaces=" "><!-- c comment -->
+$result_converted{'xml'}->{'only_comment_on_quotation_line'} = '<quotation 
spaces=" " endspaces=" "><!-- c comment -->
 <para>In quotation
 </para></quotation>
 ';

Index: t/results/quotation/quotation_and_author.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/quotation/quotation_and_author.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/quotation/quotation_and_author.pl 24 Aug 2012 16:43:23 -0000      
1.11
+++ t/results/quotation/quotation_and_author.pl 3 Sep 2012 21:58:48 -0000       
1.12
@@ -378,12 +378,12 @@
 </div>';
 
 
-$result_converted{'xml'}->{'quotation_and_author'} = '<quotation> 
+$result_converted{'xml'}->{'quotation_and_author'} = '<quotation endspaces=" 
"> 
 <author spaces=" ">Some One</author>
 <para>A quot&textmdash;ation
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Note</quotationtype>
 <author spaces=" ">Some Notifier</author>
 <para>A Note
 </para></quotation>

Index: t/results/quotation/quotation_author_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/quotation/quotation_author_in_example.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/quotation/quotation_author_in_example.pl  24 Aug 2012 16:43:23 
-0000      1.3
+++ t/results/quotation/quotation_author_in_example.pl  3 Sep 2012 21:58:48 
-0000       1.4
@@ -265,8 +265,8 @@
 ';
 
 
-$result_converted{'xml'}->{'quotation_author_in_example'} = '<example>
-<quotation> 
+$result_converted{'xml'}->{'quotation_author_in_example'} = '<example 
endspaces=" ">
+<quotation endspaces=" "> 
 <pre xml:space="preserve"><author spaces=" ">Some One</author>
 A quot---ation
 </pre></quotation>

Index: t/results/quotation/quotation_beginning_and_end_on_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/quotation/quotation_beginning_and_end_on_line.pl  24 Aug 2012 
16:43:23 -0000      1.3
+++ t/results/quotation/quotation_beginning_and_end_on_line.pl  3 Sep 2012 
21:58:48 -0000       1.4
@@ -138,7 +138,7 @@
 ';
 
 
-$result_converted{'xml'}->{'quotation_beginning_and_end_on_line'} = 
'<quotation spaces=" "><quotationtype>in quotation </quotationtype></quotation>
+$result_converted{'xml'}->{'quotation_beginning_and_end_on_line'} = 
'<quotation spaces=" " endspaces=" "><quotationtype>in quotation 
</quotationtype></quotation>
 ';
 
 

Index: t/results/quotation/space_at_commands_end_quotation_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/quotation/space_at_commands_end_quotation_line.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/quotation/space_at_commands_end_quotation_line.pl 24 Aug 2012 
16:43:23 -0000      1.10
+++ t/results/quotation/space_at_commands_end_quotation_line.pl 3 Sep 2012 
21:58:48 -0000       1.11
@@ -374,10 +374,10 @@
 
 
 $result_converted{'xml'}->{'space_at_commands_end_quotation_line'} = '
-<quotation spaces=" "><quotationtype>&arobase; at the end of line <spacecmd 
type="nl"/></quotationtype><para>A &arobase; at the end of the 
&arobase;quotation line.
+<quotation spaces=" " endspaces=" "><quotationtype>&arobase; at the end of 
line <spacecmd type="nl"/></quotationtype><para>A &arobase; at the end of the 
&arobase;quotation line.
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>&arobase;<spacecmd type="spc"/> at the 
end of line <spacecmd type="spc"/></quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>&arobase;<spacecmd 
type="spc"/> at the end of line <spacecmd type="spc"/></quotationtype>
 <para>A &arobase;<spacecmd type="spc"/> at the end of the &arobase;quotation 
line.
 </para></quotation>
 ';

Index: t/results/quotation/standard_quotations.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/quotation/standard_quotations.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/quotation/standard_quotations.pl  24 Aug 2012 16:43:23 -0000      
1.9
+++ t/results/quotation/standard_quotations.pl  3 Sep 2012 21:58:48 -0000       
1.10
@@ -837,27 +837,27 @@
 ';
 
 
-$result_converted{'xml'}->{'standard_quotations'} = '<quotation spaces=" 
"><quotationtype>Note</quotationtype>
+$result_converted{'xml'}->{'standard_quotations'} = '<quotation spaces=" " 
endspaces=" "><quotationtype>Note</quotationtype>
 <para>A Note
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>note</quotationtype>
 <para>A note
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Caution</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Caution</quotationtype>
 <para>Caution
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Important</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Important</quotationtype>
 <para>Important
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Tip</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Tip</quotationtype>
 <para>a Tip
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Warning</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Warning</quotationtype>
 <para>a Warning.
 </para></quotation>
 ';

Index: t/results/sectioning/chapter_between_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/sectioning/chapter_between_nodes.pl       26 Aug 2012 23:00:58 
-0000      1.11
+++ t/results/sectioning/chapter_between_nodes.pl       3 Sep 2012 21:58:48 
-0000       1.12
@@ -889,7 +889,7 @@
 <top spaces=" "><sectiontitle>top section</sectiontitle>
 <para>Top node
 </para>
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">section 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/sectioning/chapter_node_before_and_after_part.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- t/results/sectioning/chapter_node_before_and_after_part.pl  26 Aug 2012 
23:00:58 -0000      1.34
+++ t/results/sectioning/chapter_node_before_and_after_part.pl  3 Sep 2012 
21:58:48 -0000       1.35
@@ -822,7 +822,7 @@
 <node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">after</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <chapter spaces=" "><sectiontitle>chapter</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">after</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/sectioning/double_node_anchor_float.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- t/results/sectioning/double_node_anchor_float.pl    27 Aug 2012 22:04:48 
-0000      1.39
+++ t/results/sectioning/double_node_anchor_float.pl    3 Sep 2012 21:58:48 
-0000       1.40
@@ -1166,13 +1166,13 @@
 
 <node name="" spaces=" "><nodename></nodename></node>
 
-<float type="Text" spaces=" "><floattype>Text</floattype><floatname spaces=" 
">node1</floatname>
+<float type="Text" spaces=" " endspaces=" 
"><floattype>Text</floattype><floatname spaces=" ">node1</floatname>
 </float>
 
-<float type="Text" spaces=" "><floattype>Text</floattype><floatname spaces=" 
">anchor1</floatname>
+<float type="Text" spaces=" " endspaces=" 
"><floattype>Text</floattype><floatname spaces=" ">anchor1</floatname>
 </float>
 
-<float name="float1" type="Text" spaces=" 
"><floattype>Text</floattype><floatname spaces=" ">float1</floatname>
+<float name="float1" type="Text" spaces=" " endspaces=" 
"><floattype>Text</floattype><floatname spaces=" ">float1</floatname>
 </float>
 
 <node name="" spaces=" "><nodename></nodename></node>

Index: t/results/sectioning/double_part.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/double_part.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/sectioning/double_part.pl 26 Aug 2012 23:00:59 -0000      1.29
+++ t/results/sectioning/double_part.pl 3 Sep 2012 21:58:48 -0000       1.30
@@ -985,7 +985,7 @@
 $result_converted{'xml'}->{'double_part'} = '<node name="Top" spaces=" 
"><nodename>Top</nodename><nodenext automatic="on">node 
chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">node 
chapter</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/sectioning/explicit_node_directions.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/explicit_node_directions.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/explicit_node_directions.pl    26 Aug 2012 23:00:59 
-0000      1.9
+++ t/results/sectioning/explicit_node_directions.pl    3 Sep 2012 21:58:48 
-0000       1.10
@@ -971,7 +971,7 @@
 
 $result_converted{'xml'}->{'explicit_node_directions'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">second 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <para>Top node
-</para><menu>
+</para><menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">second 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">third node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/sectioning/more_sections_than_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/sectioning/more_sections_than_nodes.pl    26 Aug 2012 15:27:35 
-0000      1.5
+++ t/results/sectioning/more_sections_than_nodes.pl    3 Sep 2012 21:58:48 
-0000       1.6
@@ -2089,7 +2089,7 @@
 $result_converted{'xml'}->{'more_sections_than_nodes'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">n 
c2</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">n 
c2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">n c3</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">n c3 s1 s2</menunode><menudescription><pre xml:space="preserve">
@@ -2109,7 +2109,7 @@
 <node name="n-c3" spaces=" "><nodename>n c3</nodename><nodenext spaces=" ">n 
c3 s1 s2</nodenext><nodeprev spaces=" ">n c2</nodeprev><nodeup spaces=" 
">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>c3</sectiontitle>
 
-<menu> 
+<menu endspaces=" "> 
 <menuentry leadingtext="* "><menunode separator="::">n c3 s 
2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/sectioning/node_part_chapter_after_chapter.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- t/results/sectioning/node_part_chapter_after_chapter.pl     26 Aug 2012 
23:00:59 -0000      1.39
+++ t/results/sectioning/node_part_chapter_after_chapter.pl     3 Sep 2012 
21:58:48 -0000       1.40
@@ -1297,7 +1297,7 @@
 $result_converted{'xml'}->{'node_part_chapter_after_chapter'} = '<node 
name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">part chapter node</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/sectioning/node_part_chapter_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/sectioning/node_part_chapter_after_top.pl 26 Aug 2012 23:00:59 
-0000      1.28
+++ t/results/sectioning/node_part_chapter_after_top.pl 3 Sep 2012 21:58:48 
-0000       1.29
@@ -880,7 +880,7 @@
 $result_converted{'xml'}->{'node_part_chapter_after_top'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/nodes_after_top_before_chapter_nodes.pl        26 Aug 
2012 23:01:00 -0000      1.9
+++ t/results/sectioning/nodes_after_top_before_chapter_nodes.pl        3 Sep 
2012 21:58:48 -0000       1.10
@@ -1063,7 +1063,7 @@
 
 $result_converted{'xml'}->{'nodes_after_top_before_chapter_nodes'} = '<node 
name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">second 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <para>Top node
-</para><menu>
+</para><menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">second 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">third node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/sectioning/nodes_no_node_top_explicit_directions.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/nodes_no_node_top_explicit_directions.pl       26 Aug 
2012 23:01:00 -0000      1.8
+++ t/results/sectioning/nodes_no_node_top_explicit_directions.pl       3 Sep 
2012 21:58:48 -0000       1.9
@@ -709,7 +709,7 @@
 $result_converted{'xml'}->{'nodes_no_node_top_explicit_directions'} = '<node 
name="first" spaces=" "><nodename>first</nodename><nodeup>(dir)</nodeup></node>
 <para>first node
 </para>
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">second 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/sectioning/part_chapter_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/sectioning/part_chapter_after_top.pl      26 Aug 2012 23:01:00 
-0000      1.27
+++ t/results/sectioning/part_chapter_after_top.pl      3 Sep 2012 21:58:49 
-0000       1.28
@@ -870,7 +870,7 @@
 $result_converted{'xml'}->{'part_chapter_after_top'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">chapter</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/sectioning/part_node_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_after_top.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/sectioning/part_node_after_top.pl 26 Aug 2012 23:01:00 -0000      
1.19
+++ t/results/sectioning/part_node_after_top.pl 3 Sep 2012 21:58:49 -0000       
1.20
@@ -765,7 +765,7 @@
 $result_converted{'xml'}->{'part_node_after_top'} = '<node name="Top" spaces=" 
"><nodename>Top</nodename><nodenext automatic="on">part node after 
top</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">part node after 
top</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/sectioning/part_node_before_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_before_top.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/sectioning/part_node_before_top.pl        26 Aug 2012 23:01:00 
-0000      1.29
+++ t/results/sectioning/part_node_before_top.pl        3 Sep 2012 21:58:49 
-0000       1.30
@@ -820,7 +820,7 @@
 <node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">part node before top</nodenext><nodeup 
automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">part node before 
top</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 </top>

Index: t/results/sectioning/part_node_chapter_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- t/results/sectioning/part_node_chapter_after_top.pl 26 Aug 2012 23:01:00 
-0000      1.39
+++ t/results/sectioning/part_node_chapter_after_top.pl 3 Sep 2012 21:58:49 
-0000       1.40
@@ -1202,7 +1202,7 @@
 $result_converted{'xml'}->{'part_node_chapter_after_top'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">a node after 
part</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">a node after 
part</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chapter</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/sectioning/part_node_chapter_appendix.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_appendix.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/part_node_chapter_appendix.pl  26 Aug 2012 23:01:01 
-0000      1.8
+++ t/results/sectioning/part_node_chapter_appendix.pl  3 Sep 2012 21:58:49 
-0000       1.9
@@ -1002,7 +1002,7 @@
 $result_converted{'xml'}->{'part_node_chapter_appendix'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/sectioning/part_node_chapter_node_appendix.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_node_appendix.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/part_node_chapter_node_appendix.pl     26 Aug 2012 
23:01:01 -0000      1.8
+++ t/results/sectioning/part_node_chapter_node_appendix.pl     3 Sep 2012 
21:58:49 -0000       1.9
@@ -1211,7 +1211,7 @@
 $result_converted{'xml'}->{'part_node_chapter_node_appendix'} = '<node 
name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">appendix node</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/sectioning/part_node_node_part_appendix.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/part_node_node_part_appendix.pl        26 Aug 2012 
23:01:01 -0000      1.8
+++ t/results/sectioning/part_node_node_part_appendix.pl        3 Sep 2012 
21:58:49 -0000       1.9
@@ -1314,7 +1314,7 @@
 $result_converted{'xml'}->{'part_node_node_part_appendix'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">appendix part</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/sectioning/part_node_part_appendix.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_part_appendix.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/part_node_part_appendix.pl     26 Aug 2012 23:01:01 
-0000      1.8
+++ t/results/sectioning/part_node_part_appendix.pl     3 Sep 2012 21:58:49 
-0000       1.9
@@ -1090,7 +1090,7 @@
 $result_converted{'xml'}->{'part_node_part_appendix'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 

Index: t/results/sectioning/part_node_part_node_appendix.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_part_node_appendix.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/part_node_part_node_appendix.pl        26 Aug 2012 
23:01:01 -0000      1.8
+++ t/results/sectioning/part_node_part_node_appendix.pl        3 Sep 2012 
21:58:49 -0000       1.9
@@ -1304,7 +1304,7 @@
 $result_converted{'xml'}->{'part_node_part_node_appendix'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">chapter 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">appendix node</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/sectioning/section_before_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/section_before_top.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/sectioning/section_before_top.pl  26 Aug 2012 23:01:01 -0000      
1.30
+++ t/results/sectioning/section_before_top.pl  3 Sep 2012 21:58:49 -0000       
1.31
@@ -688,7 +688,7 @@
 <node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">section node</nodenext><nodeup 
automatic="on">(dir)</nodeup></node>
 <unnumberedsec originalcommand="top" spaces=" 
"><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">section 
node</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 </unnumberedsec>

Index: t/results/sectioning/section_in_unnumbered_plaintext.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- t/results/sectioning/section_in_unnumbered_plaintext.pl     26 Aug 2012 
23:01:02 -0000      1.34
+++ t/results/sectioning/section_in_unnumbered_plaintext.pl     3 Sep 2012 
21:58:49 -0000       1.35
@@ -9621,7 +9621,7 @@
 
 <para>Menu:
 </para>
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode 
separator="::">chapter</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumbered</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chapter 2</menunode><menudescription><pre xml:space="preserve">
@@ -9633,7 +9633,7 @@
 <node name="chapter" spaces=" "><nodename>chapter</nodename><nodenext 
automatic="on">unnumbered</nodenext><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>chapter</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">section in 
chapter</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
@@ -9645,7 +9645,7 @@
 <node name="unnumbered" spaces=" "><nodename>unnumbered</nodename><nodenext 
automatic="on">chapter 2</nodenext><nodeprev 
automatic="on">chapter</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <unnumbered spaces=" "><sectiontitle>unnumbered</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">section in 
unnumbered</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
@@ -9657,7 +9657,7 @@
 <node name="chapter-2" spaces=" "><nodename>chapter 2</nodename><nodenext 
automatic="on">chapter 3</nodenext><nodeprev 
automatic="on">unnumbered</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>chapter 2</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">unnumberedsec 
2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumberedsec 2-1</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
@@ -9665,7 +9665,7 @@
 <node name="unnumberedsec-2" spaces=" "><nodename>unnumberedsec 
2</nodename><nodenext automatic="on">unnumberedsec 2-1</nodenext><nodeup 
automatic="on">chapter 2</nodeup></node>
 <unnumberedsec spaces=" "><sectiontitle>unnumbered section 2</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">unnumbered sub 
2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">numbered sub 2</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumbered sub2 2</menunode><menudescription><pre 
xml:space="preserve">
@@ -9692,7 +9692,7 @@
 <node name="unnumberedsec-2_002d1" spaces=" "><nodename>unnumberedsec 
2-1</nodename><nodeprev automatic="on">unnumberedsec 2</nodeprev><nodeup 
automatic="on">chapter 2</nodeup></node>
 <unnumberedsec spaces=" "><sectiontitle>unnumberedsec 2-1</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">numbered sub 
2-1</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
@@ -9706,7 +9706,7 @@
 <node name="chapter-3" spaces=" "><nodename>chapter 3</nodename><nodenext 
automatic="on">unnumbered 4</nodenext><nodeprev automatic="on">chapter 
2</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>chapter 3</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">unnumberedsec 
3</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">section 3-1</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumberedsec 3-2</menunode><menudescription><pre 
xml:space="preserve">
@@ -9717,7 +9717,7 @@
 <node name="unnumberedsec-3" spaces=" "><nodename>unnumberedsec 
3</nodename><nodenext automatic="on">section 3-1</nodenext><nodeup 
automatic="on">chapter 3</nodeup></node>
 <unnumberedsec spaces=" "><sectiontitle>unnumbered section 3</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">unnumbered sub 
3</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">numbered sub 3</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumbered sub2 3</menunode><menudescription><pre 
xml:space="preserve">
@@ -9748,7 +9748,7 @@
 <node name="unnumberedsec-3_002d2" spaces=" "><nodename>unnumberedsec 
3-2</nodename><nodenext automatic="on">section 3-3</nodenext><nodeprev 
automatic="on">section 3-1</nodeprev><nodeup automatic="on">chapter 
3</nodeup></node>
 <unnumberedsec spaces=" "><sectiontitle>unnumberedsec 3-2</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">numbered sub 
3-2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
@@ -9760,7 +9760,7 @@
 <node name="section-3_002d3" spaces=" "><nodename>section 
3-3</nodename><nodenext automatic="on">unnumberedsec 3-4</nodenext><nodeprev 
automatic="on">unnumberedsec 3-2</nodeprev><nodeup automatic="on">chapter 
3</nodeup></node>
 <section spaces=" "><sectiontitle>section 3-3</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">subsection 
3-3</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
@@ -9772,7 +9772,7 @@
 <node name="unnumberedsec-3_002d4" spaces=" "><nodename>unnumberedsec 
3-4</nodename><nodeprev automatic="on">section 3-3</nodeprev><nodeup 
automatic="on">chapter 3</nodeup></node>
 <unnumberedsec spaces=" "><sectiontitle>unnumberedsec 3-4</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">numbered sub 
3-4</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
@@ -9785,14 +9785,14 @@
 <node name="unnumbered-4" spaces=" "><nodename>unnumbered 
4</nodename><nodeprev automatic="on">chapter 3</nodeprev><nodeup 
automatic="on">Top</nodeup></node>
 <unnumbered spaces=" "><sectiontitle>unnumbered  4</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">unnumberedsec 
4</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
 <node name="unnumberedsec-4" spaces=" "><nodename>unnumberedsec 
4</nodename><nodeup automatic="on">unnumbered 4</nodeup></node>
 <unnumberedsec spaces=" "><sectiontitle>unnumbered section 4</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">unnumbered sub 
4</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">numbered sub 4</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">unnumbered sub2 4</menunode><menudescription><pre 
xml:space="preserve">

Index: t/results/sectioning/two_nodes_between_chapters.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/sectioning/two_nodes_between_chapters.pl  26 Aug 2012 23:01:03 
-0000      1.17
+++ t/results/sectioning/two_nodes_between_chapters.pl  3 Sep 2012 21:58:49 
-0000       1.18
@@ -1360,7 +1360,7 @@
 $result_converted{'xml'}->{'two_nodes_between_chapters'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter 
1</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>top</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">chapter 
1</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">node between chapters</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">chapter 2</menunode><menudescription><pre xml:space="preserve">

Index: t/results/xml_tests/commands_and_spaces.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/xml_tests/commands_and_spaces.pl  2 Sep 2012 20:34:41 -0000       
1.6
+++ t/results/xml_tests/commands_and_spaces.pl  3 Sep 2012 21:58:49 -0000       
1.7
@@ -2550,20 +2550,20 @@
 <image spaces=" "><imagefile>a </imagefile><imagewidth>b 
 </imagewidth><imageheight>c </imageheight><alttext spaces=" 
">d</alttext><imageextension>e </imageextension></image>
 
-<quotation spaces="  "><quotationtype>Note  </quotationtype>
+<quotation spaces="  " endspaces=" "><quotationtype>Note  </quotationtype>
 <para>Q
 </para></quotation>
 
-<float name="b" type="ff" spaces="  "><floattype>ff </floattype><floatname 
spaces=" ">b   </floatname>
+<float name="b" type="ff" spaces="  " endspaces=" "><floattype>ff 
</floattype><floatname spaces=" ">b   </floatname>
 <para>f
 </para><caption spaces=" "><para>In caption </para></caption><para>j.
 </para><shortcaption><para>Short</para></shortcaption><para>  g.
 </para></float>
 
-<multitable spaces="  "><columnfractions line="  0.4  0.6  "><columnfraction 
value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
+<multitable spaces="  " endspaces=" "><columnfractions line="  0.4  0.6  
"><columnfraction value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
 </multitable>
 
-<multitable spaces="  "><columnprototypes><columnprototype bracketed="on">aa 
b</columnprototype>  
<columnprototype><var>cmd</var></columnprototype><columnprototype>gg</columnprototype>
 <columnprototype>hh</columnprototype> <columnprototype>j</columnprototype> 
</columnprototypes>
+<multitable spaces="  " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">aa b</columnprototype>  
<columnprototype><var>cmd</var></columnprototype><columnprototype>gg</columnprototype>
 <columnprototype>hh</columnprototype> <columnprototype>j</columnprototype> 
</columnprototypes>
 </multitable>
 
 <verbatim xml:space="preserve">  
@@ -2571,19 +2571,19 @@
 </verbatim>
  
 
-<tex>  
+<tex endspaces="  ">  
 in tex
 </tex>
 
-<example>  
+<example endspaces="  ">  
 <pre xml:space="preserve">in example
 </pre></example>
 
-<example spaces="  "> 
+<example spaces="  " endspaces="  "> 
 <pre xml:space="preserve">in bad example
 </pre></example>
 
-<table commandarg="strong" spaces="  ">  
+<table commandarg="strong" spaces="  " endspaces="   ">  
 <tableentry><tableterm><item spaces="  "><itemformat command="strong">in item 
</itemformat></item>
 </tableterm></tableentry></table>
 

Index: t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/xml_tests/comments_on_block_command_lines.pl      2 Sep 2012 
20:34:42 -0000       1.16
+++ t/results/xml_tests/comments_on_block_command_lines.pl      3 Sep 2012 
21:58:50 -0000       1.17
@@ -2737,67 +2737,67 @@
 
 
 
-$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize 
commandarg="bullet" spaces=" "><!-- c comm -->
+$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize 
commandarg="bullet" spaces=" " endspaces=" "><!-- c comm -->
 <listitem spaces=" "><prepend>&bullet;</prepend><para>itemize it
 </para></listitem></itemize>
 
-<itemize spaces=" "><itemprepend>x </itemprepend><!-- c comm -->
+<itemize spaces=" " endspaces=" "><itemprepend>x </itemprepend><!-- c comm -->
 <listitem spaces=" "><prepend>x</prepend><para>itemize xit
 </para></listitem></itemize>
 
-<itemize commandarg="bullet" spaces=" "><itemprepend><formattingcommand 
command="bullet" /> </itemprepend><!-- c comm -->
+<itemize commandarg="bullet" spaces=" " endspaces=" 
"><itemprepend><formattingcommand command="bullet" /> </itemprepend><!-- c comm 
-->
 <listitem spaces=" "><prepend>&bullet;</prepend><para>itemize bulletit
 </para></listitem></itemize>
 
-<itemize commandarg="bullet" spaces=" "><itemprepend>&bullet; 
</itemprepend><!-- c comm -->
+<itemize commandarg="bullet" spaces=" " endspaces=" "><itemprepend>&bullet; 
</itemprepend><!-- c comm -->
 <listitem spaces=" "><prepend>&bullet;</prepend><para>itemize bullet with 
braces
 </para></listitem></itemize>
 
-<enumerate first="1" spaces=" "><!-- c comm -->
+<enumerate first="1" spaces=" " endspaces=" "><!-- c comm -->
 <listitem spaces=" "><para>en
 </para></listitem></enumerate>
 
-<enumerate first="a" spaces=" "><enumeratefirst>a </enumeratefirst><!-- c comm 
-->
+<enumerate first="a" spaces=" " endspaces=" "><enumeratefirst>a 
</enumeratefirst><!-- c comm -->
 <listitem spaces=" "><para>aen
 </para></listitem></enumerate>
 
-<table commandarg="asis" spaces=" "> <!-- c table -->
+<table commandarg="asis" spaces=" " endspaces=" "> <!-- c table -->
 <tableentry><tableterm><item spaces=" "><itemformat 
command="asis">it</itemformat></item>
 </tableterm></tableentry></table>
 
-<quotation spaces=" "><!-- c quot no arg -->
+<quotation spaces=" " endspaces=" "><!-- c quot no arg -->
 <para>Quot no arg
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>quotarg </quotationtype><!-- c quot arg 
-->
+<quotation spaces=" " endspaces=" "><quotationtype>quotarg 
</quotationtype><!-- c quot arg -->
 <para>Quot arg
 </para></quotation>
 
-<group spaces=" "><!-- c comm -->
+<group spaces=" " endspaces=" "><!-- c comm -->
 <para>in gr
 </para></group>
 
-<example spaces=" "><!-- c comm -->
+<example spaces=" " endspaces=" "><!-- c comm -->
 <pre xml:space="preserve">in ex
 </pre></example>
 
-<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction 
value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions><!-- c comm -->
+<multitable spaces=" " endspaces=" "><columnfractions line=" 0.4 0.6 
"><columnfraction value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions><!-- c comm -->
 <tbody><row><entry command="item" spaces=" "><para>a </para></entry><entry 
command="tab" spaces=" "><para>b
 </para></entry></row></tbody></multitable>
 
-<multitable spaces=" "><columnprototypes><columnprototype 
bracketed="on">aaa</columnprototype> <columnprototype 
bracketed="on">bbb</columnprototype> </columnprototypes><!-- c c -->
+<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">aaa</columnprototype> <columnprototype 
bracketed="on">bbb</columnprototype> </columnprototypes><!-- c c -->
 <tbody><row><entry command="item" spaces=" "><para>aaa </para></entry><entry 
command="tab" spaces=" "><para>bbb
 </para></entry></row></tbody></multitable>
 
-<float name="g" type="f" spaces=" "><floattype>f</floattype><floatname>g 
</floatname><!-- c comm -->
+<float name="g" type="f" spaces=" " endspaces=" 
"><floattype>f</floattype><floatname>g </floatname><!-- c comm -->
 <para>In f
 </para></float>
 
-<flushright spaces=" "><!-- c comm -->
+<flushright spaces=" " endspaces=" "><!-- c comm -->
 <para>flushright
 </para></flushright>
 
-<raggedright spaces=" "><!-- c comm -->
+<raggedright spaces=" " endspaces=" "><!-- c comm -->
 <para>raggedright
 </para></raggedright>
 

Index: t/results/xml_tests/image_inline_or_not.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/xml_tests/image_inline_or_not.pl  28 Aug 2012 18:05:45 -0000      
1.15
+++ t/results/xml_tests/image_inline_or_not.pl  3 Sep 2012 21:58:50 -0000       
1.16
@@ -2435,7 +2435,7 @@
 
 <para>Para <image where="inline"><imagefile>jj</imagefile></image>.
 </para>
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">
 <image where="inline"><imagefile>in_example</imagefile></image>
 
@@ -2443,11 +2443,11 @@
 <image where="inline"><imagefile>in example after text</imagefile></image>
 </pre></example>
 
-<quotation spaces=" "><quotationtype><image 
where="inline"><imagefile>in_quotation_arg</imagefile></image></quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype><image 
where="inline"><imagefile>in_quotation_arg</imagefile></image></quotationtype>
 <image><imagefile>in_quotation_content</imagefile></image>
 </quotation>
 
-<table commandarg="asis" spaces=" ">
+<table commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><image 
where="inline"><imagefile>in_table_item</imagefile></image></itemformat></item>
 </tableterm><tableitem>
 <image><imagefile>in_table_def</imagefile></image>
@@ -2457,7 +2457,7 @@
 <image><imagefile>in_table_def_after</imagefile></image>
 </tableitem></tableentry></table>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator=":: "><image 
where="inline"><imagefile>node_image</imagefile></image></menunode><menudescription><pre
 xml:space="preserve"><image 
where="inline"><imagefile>image_in_description</imagefile></image>
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle 
separator=": "><image 
where="inline"><imagefile>in_menu_entry_name</imagefile></image></menutitle><menunode
 separator=".">(somewhere)<image 
where="inline"><imagefile>extnode</imagefile></image></menunode><menudescription><pre
 xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
@@ -2472,7 +2472,7 @@
 <para>T<footnote spaces="\\n"><image 
where="inline"><imagefile>in_footnote</imagefile></image>
 </footnote>
 </para>
-<float name="g" type="F" spaces=" 
"><floattype>F</floattype><floatname>g</floatname>
+<float name="g" type="F" spaces=" " endspaces=" 
"><floattype>F</floattype><floatname>g</floatname>
 
 <image><imagefile>in_float</imagefile></image>
 

Index: t/results/xml_tests/raw.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xml_tests/raw.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/xml_tests/raw.pl  23 Aug 2012 18:15:28 -0000      1.5
+++ t/results/xml_tests/raw.pl  3 Sep 2012 21:58:50 -0000       1.6
@@ -232,7 +232,7 @@
 
 
 
-$result_converted{'xml'}->{'raw'} = '<tex>
+$result_converted{'xml'}->{'raw'} = '<tex endspaces=" ">
 in &lt;tex&gt;
 </tex>
 

Index: t/results/xtable/accent_on_table_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/accent_on_table_line.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/xtable/accent_on_table_line.pl    27 Aug 2012 00:38:47 -0000      
1.18
+++ t/results/xtable/accent_on_table_line.pl    3 Sep 2012 21:58:50 -0000       
1.19
@@ -309,7 +309,7 @@
 ';
 
 
-$result_converted{'xml'}->{'accent_on_table_line'} = '<table commandarg="asis" 
spaces=" ">
+$result_converted{'xml'}->{'accent_on_table_line'} = '<table commandarg="asis" 
spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis">first 
item</itemformat></item>
 </tableterm></tableentry><tableentry><tableterm><item spaces=" "><itemformat 
command="asis">no at-command <code>code</code></itemformat></item>
 </tableterm></tableentry></table>

Index: t/results/xtable/block_commands_in_table.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/block_commands_in_table.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/xtable/block_commands_in_table.pl 27 Aug 2012 00:38:47 -0000      
1.5
+++ t/results/xtable/block_commands_in_table.pl 3 Sep 2012 21:58:50 -0000       
1.6
@@ -2243,14 +2243,14 @@
 $result_converted{'xml'}->{'block_commands_in_table'} = '<node name="Top" 
spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>Element</sectiontitle>
 
-<table commandarg="emph" spaces=" ">
+<table commandarg="emph" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="emph">first 
item</itemformat></item>
 <itemx spaces=" "><itemformat command="emph">second itemx</itemformat></itemx>
 </tableterm><tableitem>
 <para>Text.
 </para>
 </tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat 
command="emph">example</itemformat></item>
-</tableterm><tableitem><example>
+</tableterm><tableitem><example endspaces=" ">
 <pre xml:space="preserve">In example
 
 end example.
@@ -2259,18 +2259,18 @@
 </tableterm><tableitem>
 <para>empty line.
 </para></tableitem></tableentry><tableentry><tableterm><item spaces=" 
"><itemformat command="emph">quotation</itemformat></item>
-</tableterm><tableitem><quotation>
+</tableterm><tableitem><quotation endspaces=" ">
 <para>Quotation
 </para></quotation>
 
 </tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat 
command="emph">quotation after a blank line</itemformat></item>
 </tableterm><tableitem>
-<quotation>
+<quotation endspaces=" ">
 <para>quotation after a blank line
 </para></quotation>
 </tableitem></tableentry></table>
 
-<vtable commandarg="strong" spaces=" ">
+<vtable commandarg="strong" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat 
command="strong"><indexterm index="vr">item before ignored 
lines</indexterm>item before ignored lines</itemformat></item>
 <!-- c comment -->
 <vindex index="vr"><indexterm index="vr">vindex</indexterm></vindex>
@@ -2278,7 +2278,7 @@
 </tableterm><tableitem>
 <para>Description
 </para></tableitem></tableentry></vtable>
-<vtable commandarg="r" spaces=" ">
+<vtable commandarg="r" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="r"><indexterm 
index="vr">item</indexterm>item</itemformat></item>
 
 <itemx spaces=" "><itemformat command="r"><indexterm index="vr">itemx after an 
empty line</indexterm>itemx after an empty line</itemformat></itemx>
@@ -2288,7 +2288,7 @@
 </tableitem></tableentry></vtable>
 
 <para>Something.
-</para><table commandarg="emph" spaces=" ">
+</para><table commandarg="emph" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="emph">in 
item</itemformat></item>
 </tableterm><tableitem><para>Text without blank line
 </para></tableitem></tableentry><tableentry><tableterm><item spaces=" 
"><itemformat command="emph">second item</itemformat></item>

Index: t/results/xtable/comment_and_itemx_before_item.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/comment_and_itemx_before_item.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/xtable/comment_and_itemx_before_item.pl   27 Aug 2012 00:38:47 
-0000      1.6
+++ t/results/xtable/comment_and_itemx_before_item.pl   3 Sep 2012 21:58:50 
-0000       1.7
@@ -236,7 +236,7 @@
 ';
 
 
-$result_converted{'xml'}->{'comment_and_itemx_before_item'} = '<table 
commandarg="code" spaces=" ">
+$result_converted{'xml'}->{'comment_and_itemx_before_item'} = '<table 
commandarg="code" spaces=" " endspaces=" ">
 <beforefirstitem><!-- c comment -->
 </beforefirstitem><tableentry><tableterm><itemx spaces=" "><itemformat 
command="code">in itemx</itemformat></itemx>
 </tableterm></tableentry></table>

Index: t/results/xtable/definfoenclose_on_table_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/xtable/definfoenclose_on_table_line.pl    27 Aug 2012 00:38:48 
-0000      1.18
+++ t/results/xtable/definfoenclose_on_table_line.pl    3 Sep 2012 21:58:50 
-0000       1.19
@@ -370,7 +370,7 @@
 
 $result_converted{'xml'}->{'definfoenclose_on_table_line'} = '<definfoenclose 
command="phi" open=":" close=":" line=" phi,:,:"></definfoenclose>
 
-<table commandarg="phi" begin=":"  end=":" spaces=" ">
+<table commandarg="phi" begin=":"  end=":" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="phi" begin=":"  
end=":">item</itemformat></item>
 <itemx spaces=" "><itemformat command="phi" begin=":"  end=":">item 
x</itemformat></itemx>
 </tableterm><tableitem>

Index: t/results/xtable/empty_item_itemx.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/empty_item_itemx.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/xtable/empty_item_itemx.pl        27 Aug 2012 00:38:48 -0000      
1.24
+++ t/results/xtable/empty_item_itemx.pl        3 Sep 2012 21:58:50 -0000       
1.25
@@ -555,7 +555,7 @@
 ';
 
 
-$result_converted{'xml'}->{'empty_item_itemx'} = '<vtable commandarg="asis" 
spaces=" ">
+$result_converted{'xml'}->{'empty_item_itemx'} = '<vtable commandarg="asis" 
spaces=" " endspaces=" ">
 <beforefirstitem>
 <para>VTable
 </para>

Index: t/results/xtable/inter_item_commands_in_table.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/xtable/inter_item_commands_in_table.pl    27 Aug 2012 00:38:48 
-0000      1.24
+++ t/results/xtable/inter_item_commands_in_table.pl    3 Sep 2012 21:58:50 
-0000       1.25
@@ -1899,20 +1899,20 @@
 ';
 
 
-$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<vtable 
commandarg="code" spaces=" ">
+$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<vtable 
commandarg="code" spaces=" " endspaces=" ">
 <beforefirstitem><!-- c comment in table -->
 </beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat 
command="code"><indexterm index="vr">a</indexterm>a</itemformat></item>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></vtable>
 
-<vtable commandarg="asis" spaces=" ">
+<vtable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="vr">a</indexterm>a</itemformat></item>
 <!-- c comment between item and itemx -->
 <itemx spaces=" "><itemformat command="asis"><indexterm 
index="vr">b</indexterm>b</itemformat></itemx>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></vtable>
 
-<ftable commandarg="var" spaces=" ">
+<ftable commandarg="var" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="var"><indexterm 
index="fn">a</indexterm>a</itemformat></item>
 <cindex index="cp"><indexterm index="cp">index entry between item and 
itemx</indexterm></cindex>
 <!-- c and a comment -->
@@ -1928,14 +1928,14 @@
 <!-- c comment at end -->
 </tableitem></tableentry></ftable>
 
-<table commandarg="code" spaces=" ">
+<table commandarg="code" spaces=" " endspaces=" ">
 <beforefirstitem><cindex index="cp"><indexterm index="cp">cindex in 
table</indexterm></cindex>
 <!-- c comment in table -->
 </beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat 
command="code">abb</itemformat></item>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></table>
 
-<table commandarg="code" spaces=" ">
+<table commandarg="code" spaces=" " endspaces=" ">
 <beforefirstitem><cindex index="cp"><indexterm index="cp">cindex in 
table</indexterm></cindex>
 <para>Texte before first item.
 </para></beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat 
command="code">abb</itemformat></item>

Index: t/results/xtable/inter_item_commands_in_table_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/xtable/inter_item_commands_in_table_in_example.pl 27 Aug 2012 
00:38:48 -0000      1.7
+++ t/results/xtable/inter_item_commands_in_table_in_example.pl 3 Sep 2012 
21:58:50 -0000       1.8
@@ -631,8 +631,8 @@
 ';
 
 
-$result_converted{'xml'}->{'inter_item_commands_in_table_in_example'} = 
'<example>
-<table commandarg="var" spaces=" ">
+$result_converted{'xml'}->{'inter_item_commands_in_table_in_example'} = 
'<example endspaces=" ">
+<table commandarg="var" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat 
command="var">a</itemformat></item>
 <pre xml:space="preserve"><cindex index="cp"><indexterm index="cp">index entry 
between item and itemx</indexterm></cindex>
 <!-- c and a comment -->

Index: t/results/xtable/long_item.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/long_item.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/xtable/long_item.pl       27 Aug 2012 00:38:48 -0000      1.16
+++ t/results/xtable/long_item.pl       3 Sep 2012 21:58:50 -0000       1.17
@@ -293,7 +293,7 @@
 ';
 
 
-$result_converted{'xml'}->{'long_item'} = '<table commandarg="emph" spaces=" ">
+$result_converted{'xml'}->{'long_item'} = '<table commandarg="emph" spaces=" " 
endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="emph">first item  
    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
aaaaaaaaaaaaaaaaaa</itemformat></item>
 <itemx spaces=" "><itemformat command="emph">second itemx 
bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b b b b b b b b b b b b b</itemformat></itemx>
 </tableterm><tableitem>

Index: t/results/xtable/table_nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/table_nested.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/xtable/table_nested.pl    27 Aug 2012 00:38:48 -0000      1.22
+++ t/results/xtable/table_nested.pl    3 Sep 2012 21:58:50 -0000       1.23
@@ -3407,8 +3407,8 @@
 
 
 <para>Quotation
-</para><quotation>
-<vtable commandarg="asis" spaces=" ">
+</para><quotation endspaces=" ">
+<vtable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="vr">first item</indexterm>first item</itemformat></item>
 <itemx spaces=" "><itemformat command="asis"><indexterm index="vr">second 
itemx</indexterm>second itemx</itemformat></itemx>
 </tableterm><tableitem>
@@ -3422,7 +3422,7 @@
 </tableterm></tableentry></vtable>
 
 <para>Something.
-</para><table commandarg="emph" spaces=" ">
+</para><table commandarg="emph" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="emph">in 
item</itemformat></item>
 </tableterm><tableitem><para>Text without blank line
 </para></tableitem></tableentry><tableentry><tableterm><item spaces=" 
"><itemformat command="emph">second item</itemformat></item>
@@ -3432,8 +3432,8 @@
 </para></quotation>
 
 <para>Example
-</para><example>
-<vtable commandarg="asis" spaces=" ">
+</para><example endspaces=" ">
+<vtable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="vr">first item</indexterm>first item</itemformat></item>
 <itemx spaces=" "><itemformat command="asis"><indexterm index="vr">second 
itemx</indexterm>second itemx</itemformat></itemx>
 </tableterm><tableitem><pre xml:space="preserve">
@@ -3447,7 +3447,7 @@
 </tableterm></tableentry></vtable>
 <pre xml:space="preserve">
 Something.
-</pre><table commandarg="emph" spaces=" ">
+</pre><table commandarg="emph" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="emph">in 
item</itemformat></item>
 </tableterm><tableitem><pre xml:space="preserve">Text without blank line
 </pre></tableitem></tableentry><tableentry><tableterm><item spaces=" 
"><itemformat command="emph">second item</itemformat></item>
@@ -3457,9 +3457,9 @@
 </pre></example>
 
 <para>Double quotation
-</para><quotation>
-<quotation>
-<vtable commandarg="asis" spaces=" ">
+</para><quotation endspaces=" ">
+<quotation endspaces=" ">
+<vtable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="vr">first item</indexterm>first item</itemformat></item>
 <itemx spaces=" "><itemformat command="asis"><indexterm index="vr">second 
itemx</indexterm>second itemx</itemformat></itemx>
 </tableterm><tableitem>
@@ -3473,7 +3473,7 @@
 </tableterm></tableentry></vtable>
 
 <para>Something.
-</para><table commandarg="emph" spaces=" ">
+</para><table commandarg="emph" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="emph">in 
item</itemformat></item>
 </tableterm><tableitem><para>Text without blank line
 </para></tableitem></tableentry><tableentry><tableterm><item spaces=" 
"><itemformat command="emph">second item</itemformat></item>

Index: tests/formatting/res_parser/cond_xml/cond.xml
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/formatting/res_parser/cond_xml/cond.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/formatting/res_parser/cond_xml/cond.xml       24 Aug 2012 16:43:26 
-0000      1.2
+++ tests/formatting/res_parser/cond_xml/cond.xml       3 Sep 2012 21:58:51 
-0000       1.3
@@ -7,7 +7,7 @@
 
 <node name="Top" spaces=" "><nodename>Top</nodename><nodeup 
automatic="on">(dir)</nodeup></node>
 
-<html>
+<html endspaces=" ">
 This is html text.
 </html>
 
@@ -19,7 +19,7 @@
 <para>This is ifnotinfo text.
 </para>
 
-<tex>
+<tex endspaces=" ">
 This is tex text.
 </tex>
 

Index: tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- tests/layout/res_parser/formatting_xml/formatting.xml       29 Aug 2012 
07:32:08 -0000      1.11
+++ tests/layout/res_parser/formatting_xml/formatting.xml       3 Sep 2012 
21:58:51 -0000       1.12
@@ -7,7 +7,7 @@
 <node name="Top" spaces=" "><nodename>Top</nodename><nodenext 
automatic="on">chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top spaces=" "><sectiontitle>Top section</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::               
">chapter</menunode><menudescription><pre xml:space="preserve">chapter
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 Menu comment
@@ -742,7 +742,7 @@
 </macro>
 
 
-<copying>
+<copying endspaces=" ">
 <para>In copying
 </para>
 <para>&lt;
@@ -944,98 +944,98 @@
 <code>&arobase;clicksequence&lbrace;click &arobase;click&lbrace;&rbrace; 
A&rbrace;</code> <clicksequence>click <click command="result"/> 
A</clicksequence>
 <clickstyle command="arrow" line=" @arrow">@arrow</clickstyle>
 </para>
-<quotation> 
+<quotation endspaces=" "> 
 <para>A quot&textmdash;ation
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Note</quotationtype>
 <para>A Note
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>note</quotationtype>
 <para>A note
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Caution</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Caution</quotationtype>
 <para>Caution
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Important</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Important</quotationtype>
 <para>Important
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Tip</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Tip</quotationtype>
 <para>a Tip
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Warning</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Warning</quotationtype>
 <para>a Warning.
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>something <accent type="acute" 
bracketed="off">e</accent> &tex;</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>something <accent 
type="acute" bracketed="off">e</accent> &tex;</quotationtype>
 <para>The something <accent type="acute" bracketed="off">e</accent> &tex; is 
here.
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>&arobase; at the end of line <spacecmd 
type="nl"/></quotationtype><para>A &arobase; at the end of the 
&arobase;quotation line.
+<quotation spaces=" " endspaces=" "><quotationtype>&arobase; at the end of 
line <spacecmd type="nl"/></quotationtype><para>A &arobase; at the end of the 
&arobase;quotation line.
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>something, other thing</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>something, other 
thing</quotationtype>
 <para>something, other thing
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Note, the note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Note, the 
note</quotationtype>
 <para>Note, the note
 </para></quotation>
 
-<quotation>
+<quotation endspaces=" ">
 </quotation>
 
-<quotation spaces=" "><quotationtype>Empty</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Empty</quotationtype>
 </quotation>
 
-<quotation spaces=" "><quotationtype><asis></asis></quotationtype>
+<quotation spaces=" " endspaces=" 
"><quotationtype><asis></asis></quotationtype>
 </quotation>
 
-<quotation spaces=" "><quotationtype>&linebreak;</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>&linebreak;</quotationtype>
 </quotation>
 
 
-<itemize commandarg="bullet">
+<itemize commandarg="bullet" endspaces=" ">
 <listitem spaces=" "><prepend>&bullet;</prepend><para>i&textndash;temize
 </para></listitem></itemize>
 
-<itemize spaces=" "><itemprepend>+</itemprepend>
+<itemize spaces=" " endspaces=" "><itemprepend>+</itemprepend>
 <listitem spaces=" "><prepend>+</prepend><para>i&textndash;tem +
 </para></listitem></itemize>
 
-<itemize commandarg="bullet" spaces=" "><itemprepend><formattingcommand 
command="bullet" /></itemprepend>
+<itemize commandarg="bullet" spaces=" " endspaces=" 
"><itemprepend><formattingcommand command="bullet" /></itemprepend>
 <listitem spaces=" "><prepend>&bullet;</prepend><para>b&textndash;ullet
 </para></listitem></itemize>
 
-<itemize commandarg="minus" spaces=" "><itemprepend><formattingcommand 
command="minus" /></itemprepend>
+<itemize commandarg="minus" spaces=" " endspaces=" 
"><itemprepend><formattingcommand command="minus" /></itemprepend>
 <listitem spaces=" "><prepend>&minus;</prepend><para>minu&textndash;s
 </para></listitem></itemize>
 
-<itemize commandarg="emph" spaces=" ">
+<itemize commandarg="emph" spaces=" " endspaces=" ">
 <listitem spaces=" "><prepend></prepend><para>e&textndash;mph item
 </para></listitem></itemize>
 
-<itemize spaces=" "><itemprepend><emph>after emph</emph></itemprepend>
+<itemize spaces=" " endspaces=" "><itemprepend><emph>after 
emph</emph></itemprepend>
 <beforefirstitem><!-- c comment in itemize -->
 </beforefirstitem><listitem spaces=" "><prepend><emph>after 
emph</emph></prepend><para>e&textndash;mph item
 </para></listitem></itemize>
 
-<itemize spaces=" "><itemprepend>&bullet; a&textndash;n itemize 
line</itemprepend>
+<itemize spaces=" " endspaces=" "><itemprepend>&bullet; a&textndash;n itemize 
line</itemprepend>
 <beforefirstitem><cindex index="cp"><indexterm index="cp">index entry within 
itemize</indexterm></cindex>
 </beforefirstitem><listitem spaces=" "><prepend>&bullet; a&textndash;n itemize 
line</prepend><para>i&textndash;tem 1
 </para></listitem><listitem spaces=" "><prepend>&bullet; a&textndash;n itemize 
line</prepend><para>i&textndash;tem 2
 </para></listitem></itemize>
 
-<enumerate first="1">
+<enumerate first="1" endspaces=" ">
 <listitem spaces=" "><para>e&textndash;numerate
 </para></listitem></enumerate>
 
-<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction 
value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions line=" 0.4 0.6 
"><columnfraction value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
 <thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable 
headitem </para></entry><entry command="tab" spaces=" "><para>another tab
 </para></entry></row></thead><tbody><row><entry command="item" spaces=" 
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces=" 
"><para>multitable tab
 <!-- c comment in multitable -->
@@ -1044,52 +1044,52 @@
 </para></entry></row><row><entry command="item" spaces=" "><para>lone 
mu&textndash;ltitable item
 </para></entry></row></tbody></multitable>
 
-<multitable spaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype> <columnprototype 
bracketed="on">bidule</columnprototype></columnprototypes>
+<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype> <columnprototype 
bracketed="on">bidule</columnprototype></columnprototypes>
 <tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry 
command="tab" spaces=" "><para>bidule
 </para></entry></row></tbody></multitable>
 
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">e--xample  some
    text
 </pre></example>
 
-<smallexample>
+<smallexample endspaces=" ">
 <pre xml:space="preserve">s--mallexample
 </pre></smallexample>
 
-<display> 
+<display endspaces=" "> 
 <pre xml:space="preserve">d&textndash;isplay
 </pre></display>
 
-<smalldisplay>
+<smalldisplay endspaces=" ">
 <pre xml:space="preserve">s&textndash;malldisplay
 </pre></smalldisplay>
 
-<lisp>
+<lisp endspaces=" ">
 <pre xml:space="preserve">l--isp
 </pre></lisp>
 
-<smalllisp>
+<smalllisp endspaces=" ">
 <pre xml:space="preserve">s--malllisp
 </pre></smalllisp>
 
-<format>
+<format endspaces=" ">
 <pre xml:space="preserve">f&textndash;ormat
 </pre></format>
 
-<smallformat>
+<smallformat endspaces=" ">
 <pre xml:space="preserve">s&textndash;mallformat
 </pre></smallformat>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;effn
 </para></definitionitem></deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
 <definitionitem><para>def&textndash;fn
 </para></definitionitem></deffn>
  
-<deffn spaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
 <cindex index="cp"><indexterm index="cp">index entry within 
deffn</indexterm></cindex>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
@@ -1114,89 +1114,89 @@
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory> 
<deffunction>deffnx</deffunction> <defparam>before</defparam> 
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
 </deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction></definitionterm>
 </deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction> <defparam>with</defparam> 
<defparam>deffnx</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction> <defparam>with</defparam> 
<defparam>deffnx</defparam></definitionterm>
 <!-- c comment between deffn and deffnx -->
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">deffnx</indexterm><defcategory>empty</defcategory> 
<deffunction>deffnx</deffunction></definitionterm></deffnx>
 </deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <definitionitem><!-- c comment -->
 <para>text in def item for second def item
 </para></definitionitem></deffn>
 
-<defvr spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
+<defvr spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efvr
 </para></definitionitem></defvr>
 
-<deftypefn spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefn
 </para></definitionitem></deftypefn>
 
-<deftypeop spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypeop spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypeop
 </para></definitionitem></deftypeop>
 
-<deftypevr spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
+<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevr
 </para></definitionitem></deftypevr>
 
-<defcv spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
+<defcv spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efcv
 </para></definitionitem></defcv>
 
-<defop spaces=" "><definitionterm><indexterm index="fn">d&textndash;efop_name 
on c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defop spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efop
 </para></definitionitem></defop>
 
-<deftp spaces=" "><definitionterm><indexterm 
index="tp">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
+<deftp spaces=" " endspaces=" "><definitionterm><indexterm 
index="tp">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftp
 </para></definitionitem></deftp>
 
-<defun spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efun
 </para></definitionitem></defun>
 
-<defmac spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmac spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmac
 </para></definitionitem></defmac>
 
-<defspec spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efspec
 </para></definitionitem></defspec>
 
-<defvar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+<defvar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
 <definitionitem><para>d&textndash;efvar
 </para></definitionitem></defvar>
 
-<defopt spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
+<defopt spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efopt
 </para></definitionitem></defopt>
 
-<deftypefun spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefun
 </para></definitionitem></deftypefun>
 
-<deftypevar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevar
 </para></definitionitem></deftypevar>
 
-<defivar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+<defivar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efivar
 </para></definitionitem></defivar>
 
-<deftypeivar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;eftypeivar
 </para></definitionitem></deftypeivar>
 
-<defmethod spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmethod
 </para></definitionitem></defmethod>
 
-<deftypemethod spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypemethod
 </para></definitionitem></deftypemethod>
 
@@ -1263,39 +1263,39 @@
 ref</inforefrefname><inforefinfoname spaces=" ">a comma&comma; in 
file</inforefinfoname></inforef>
 </para>
 
-<table commandarg="asis" spaces=" ">
+<table commandarg="asis" spaces=" " endspaces=" ">
 <beforefirstitem><!-- c comment in table -->
 </beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat 
command="asis">a</itemformat></item>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></table>
 
-<vtable commandarg="asis" spaces=" ">
+<vtable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="vr">a</indexterm>a</itemformat></item>
 <!-- c comment between item and itemx -->
 <itemx spaces=" "><itemformat command="asis"><indexterm 
index="vr">b</indexterm>b</itemformat></itemx>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></vtable>
 
-<ftable commandarg="asis" spaces=" ">
+<ftable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="fn">a</indexterm>a</itemformat></item>
 <cindex index="cp"><indexterm index="cp">index entry between item and 
itemx</indexterm></cindex>
 <itemx spaces=" "><itemformat command="asis"><indexterm 
index="fn">b</indexterm>b</itemformat></itemx>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></ftable>
 
-<cartouche>
+<cartouche endspaces=" ">
 <para>c&textndash;artouche
 </para></cartouche>
 
-<group>
+<group endspaces=" ">
 <para>g&textndash;roupe
 </para></group>
 
-<flushleft>
+<flushleft endspaces=" ">
 <para>f&textndash;lushleft
 </para></flushleft>
 
-<flushright>
+<flushright endspaces=" ">
 <para>f&textndash;lushright
 </para></flushright>
 
@@ -1310,15 +1310,15 @@
 
 <para> xml para </para> ''
 
-<html>
+<html endspaces=" ">
 html &textrdquo;
 </html>
 
-<tex>
+<tex endspaces=" ">
 $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ &textrdquo;
 </tex>
 
-<docbook>
+<docbook endspaces=" ">
 docbook &textrdquo;
 </docbook>
 
@@ -1339,7 +1339,7 @@
 
 </copying>
 
-<titlepage>
+<titlepage endspaces=" ">
 <title spaces=" ">title &textndash;a</title>
 <subtitle spaces=" ">formatting subtitle &textndash;a</subtitle>
 <subtitle spaces=" ">subtitle 2 &textndash;a</subtitle>
@@ -1546,98 +1546,98 @@
 <code>&arobase;clicksequence&lbrace;click &arobase;click&lbrace;&rbrace; 
A&rbrace;</code> <clicksequence>click <click command="result"/> 
A</clicksequence>
 <clickstyle command="arrow" line=" @arrow">@arrow</clickstyle>
 </para>
-<quotation> 
+<quotation endspaces=" "> 
 <para>A quot&textmdash;ation
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Note</quotationtype>
 <para>A Note
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>note</quotationtype>
 <para>A note
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Caution</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Caution</quotationtype>
 <para>Caution
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Important</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Important</quotationtype>
 <para>Important
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Tip</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Tip</quotationtype>
 <para>a Tip
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Warning</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Warning</quotationtype>
 <para>a Warning.
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>something <accent type="acute" 
bracketed="off">e</accent> &tex;</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>something <accent 
type="acute" bracketed="off">e</accent> &tex;</quotationtype>
 <para>The something <accent type="acute" bracketed="off">e</accent> &tex; is 
here.
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>&arobase; at the end of line <spacecmd 
type="nl"/></quotationtype><para>A &arobase; at the end of the 
&arobase;quotation line.
+<quotation spaces=" " endspaces=" "><quotationtype>&arobase; at the end of 
line <spacecmd type="nl"/></quotationtype><para>A &arobase; at the end of the 
&arobase;quotation line.
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>something, other thing</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>something, other 
thing</quotationtype>
 <para>something, other thing
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Note, the note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Note, the 
note</quotationtype>
 <para>Note, the note
 </para></quotation>
 
-<quotation>
+<quotation endspaces=" ">
 </quotation>
 
-<quotation spaces=" "><quotationtype>Empty</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Empty</quotationtype>
 </quotation>
 
-<quotation spaces=" "><quotationtype><asis></asis></quotationtype>
+<quotation spaces=" " endspaces=" 
"><quotationtype><asis></asis></quotationtype>
 </quotation>
 
-<quotation spaces=" "><quotationtype>&linebreak;</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>&linebreak;</quotationtype>
 </quotation>
 
 
-<itemize commandarg="bullet">
+<itemize commandarg="bullet" endspaces=" ">
 <listitem spaces=" "><prepend>&bullet;</prepend><para>i&textndash;temize
 </para></listitem></itemize>
 
-<itemize spaces=" "><itemprepend>+</itemprepend>
+<itemize spaces=" " endspaces=" "><itemprepend>+</itemprepend>
 <listitem spaces=" "><prepend>+</prepend><para>i&textndash;tem +
 </para></listitem></itemize>
 
-<itemize commandarg="bullet" spaces=" "><itemprepend><formattingcommand 
command="bullet" /></itemprepend>
+<itemize commandarg="bullet" spaces=" " endspaces=" 
"><itemprepend><formattingcommand command="bullet" /></itemprepend>
 <listitem spaces=" "><prepend>&bullet;</prepend><para>b&textndash;ullet
 </para></listitem></itemize>
 
-<itemize commandarg="minus" spaces=" "><itemprepend><formattingcommand 
command="minus" /></itemprepend>
+<itemize commandarg="minus" spaces=" " endspaces=" 
"><itemprepend><formattingcommand command="minus" /></itemprepend>
 <listitem spaces=" "><prepend>&minus;</prepend><para>minu&textndash;s
 </para></listitem></itemize>
 
-<itemize commandarg="emph" spaces=" ">
+<itemize commandarg="emph" spaces=" " endspaces=" ">
 <listitem spaces=" "><prepend></prepend><para>e&textndash;mph item
 </para></listitem></itemize>
 
-<itemize spaces=" "><itemprepend><emph>after emph</emph></itemprepend>
+<itemize spaces=" " endspaces=" "><itemprepend><emph>after 
emph</emph></itemprepend>
 <beforefirstitem><!-- c comment in itemize -->
 </beforefirstitem><listitem spaces=" "><prepend><emph>after 
emph</emph></prepend><para>e&textndash;mph item
 </para></listitem></itemize>
 
-<itemize spaces=" "><itemprepend>&bullet; a&textndash;n itemize 
line</itemprepend>
+<itemize spaces=" " endspaces=" "><itemprepend>&bullet; a&textndash;n itemize 
line</itemprepend>
 <beforefirstitem><cindex index="cp"><indexterm index="cp">index entry within 
itemize</indexterm></cindex>
 </beforefirstitem><listitem spaces=" "><prepend>&bullet; a&textndash;n itemize 
line</prepend><para>i&textndash;tem 1
 </para></listitem><listitem spaces=" "><prepend>&bullet; a&textndash;n itemize 
line</prepend><para>i&textndash;tem 2
 </para></listitem></itemize>
 
-<enumerate first="1">
+<enumerate first="1" endspaces=" ">
 <listitem spaces=" "><para>e&textndash;numerate
 </para></listitem></enumerate>
 
-<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction 
value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions line=" 0.4 0.6 
"><columnfraction value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
 <thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable 
headitem </para></entry><entry command="tab" spaces=" "><para>another tab
 </para></entry></row></thead><tbody><row><entry command="item" spaces=" 
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces=" 
"><para>multitable tab
 <!-- c comment in multitable -->
@@ -1646,52 +1646,52 @@
 </para></entry></row><row><entry command="item" spaces=" "><para>lone 
mu&textndash;ltitable item
 </para></entry></row></tbody></multitable>
 
-<multitable spaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype> <columnprototype 
bracketed="on">bidule</columnprototype></columnprototypes>
+<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype> <columnprototype 
bracketed="on">bidule</columnprototype></columnprototypes>
 <tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry 
command="tab" spaces=" "><para>bidule
 </para></entry></row></tbody></multitable>
 
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">e--xample  some
    text
 </pre></example>
 
-<smallexample>
+<smallexample endspaces=" ">
 <pre xml:space="preserve">s--mallexample
 </pre></smallexample>
 
-<display> 
+<display endspaces=" "> 
 <pre xml:space="preserve">d&textndash;isplay
 </pre></display>
 
-<smalldisplay>
+<smalldisplay endspaces=" ">
 <pre xml:space="preserve">s&textndash;malldisplay
 </pre></smalldisplay>
 
-<lisp>
+<lisp endspaces=" ">
 <pre xml:space="preserve">l--isp
 </pre></lisp>
 
-<smalllisp>
+<smalllisp endspaces=" ">
 <pre xml:space="preserve">s--malllisp
 </pre></smalllisp>
 
-<format>
+<format endspaces=" ">
 <pre xml:space="preserve">f&textndash;ormat
 </pre></format>
 
-<smallformat>
+<smallformat endspaces=" ">
 <pre xml:space="preserve">s&textndash;mallformat
 </pre></smallformat>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;effn
 </para></definitionitem></deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
 <definitionitem><para>def&textndash;fn
 </para></definitionitem></deffn>
  
-<deffn spaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
 <cindex index="cp"><indexterm index="cp">index entry within 
deffn</indexterm></cindex>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
@@ -1716,89 +1716,89 @@
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory> 
<deffunction>deffnx</deffunction> <defparam>before</defparam> 
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
 </deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction></definitionterm>
 </deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction> <defparam>with</defparam> 
<defparam>deffnx</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction> <defparam>with</defparam> 
<defparam>deffnx</defparam></definitionterm>
 <!-- c comment between deffn and deffnx -->
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">deffnx</indexterm><defcategory>empty</defcategory> 
<deffunction>deffnx</deffunction></definitionterm></deffnx>
 </deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <definitionitem><!-- c comment -->
 <para>text in def item for second def item
 </para></definitionitem></deffn>
 
-<defvr spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
+<defvr spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efvr
 </para></definitionitem></defvr>
 
-<deftypefn spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefn
 </para></definitionitem></deftypefn>
 
-<deftypeop spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypeop spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypeop
 </para></definitionitem></deftypeop>
 
-<deftypevr spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
+<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevr
 </para></definitionitem></deftypevr>
 
-<defcv spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
+<defcv spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efcv
 </para></definitionitem></defcv>
 
-<defop spaces=" "><definitionterm><indexterm index="fn">d&textndash;efop_name 
on c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defop spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efop
 </para></definitionitem></defop>
 
-<deftp spaces=" "><definitionterm><indexterm 
index="tp">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
+<deftp spaces=" " endspaces=" "><definitionterm><indexterm 
index="tp">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftp
 </para></definitionitem></deftp>
 
-<defun spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efun
 </para></definitionitem></defun>
 
-<defmac spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmac spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmac
 </para></definitionitem></defmac>
 
-<defspec spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efspec
 </para></definitionitem></defspec>
 
-<defvar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+<defvar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
 <definitionitem><para>d&textndash;efvar
 </para></definitionitem></defvar>
 
-<defopt spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
+<defopt spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efopt
 </para></definitionitem></defopt>
 
-<deftypefun spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefun
 </para></definitionitem></deftypefun>
 
-<deftypevar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevar
 </para></definitionitem></deftypevar>
 
-<defivar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+<defivar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efivar
 </para></definitionitem></defivar>
 
-<deftypeivar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;eftypeivar
 </para></definitionitem></deftypeivar>
 
-<defmethod spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmethod
 </para></definitionitem></defmethod>
 
-<deftypemethod spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypemethod
 </para></definitionitem></deftypemethod>
 
@@ -1865,39 +1865,39 @@
 ref</inforefrefname><inforefinfoname spaces=" ">a comma&comma; in 
file</inforefinfoname></inforef>
 </para>
 
-<table commandarg="asis" spaces=" ">
+<table commandarg="asis" spaces=" " endspaces=" ">
 <beforefirstitem><!-- c comment in table -->
 </beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat 
command="asis">a</itemformat></item>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></table>
 
-<vtable commandarg="asis" spaces=" ">
+<vtable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="vr">a</indexterm>a</itemformat></item>
 <!-- c comment between item and itemx -->
 <itemx spaces=" "><itemformat command="asis"><indexterm 
index="vr">b</indexterm>b</itemformat></itemx>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></vtable>
 
-<ftable commandarg="asis" spaces=" ">
+<ftable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="fn">a</indexterm>a</itemformat></item>
 <cindex index="cp"><indexterm index="cp">index entry between item and 
itemx</indexterm></cindex>
 <itemx spaces=" "><itemformat command="asis"><indexterm 
index="fn">b</indexterm>b</itemformat></itemx>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></ftable>
 
-<cartouche>
+<cartouche endspaces=" ">
 <para>c&textndash;artouche
 </para></cartouche>
 
-<group>
+<group endspaces=" ">
 <para>g&textndash;roupe
 </para></group>
 
-<flushleft>
+<flushleft endspaces=" ">
 <para>f&textndash;lushleft
 </para></flushleft>
 
-<flushright>
+<flushright endspaces=" ">
 <para>f&textndash;lushright
 </para></flushright>
 
@@ -1912,15 +1912,15 @@
 
 <para> xml para </para> ''
 
-<html>
+<html endspaces=" ">
 html &textrdquo;
 </html>
 
-<tex>
+<tex endspaces=" ">
 $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ &textrdquo;
 </tex>
 
-<docbook>
+<docbook endspaces=" ">
 docbook &textrdquo;
 </docbook>
 
@@ -2148,98 +2148,98 @@
 <code>&arobase;clicksequence&lbrace;click &arobase;click&lbrace;&rbrace; 
A&rbrace;</code> <clicksequence>click <click command="result"/> 
A</clicksequence>
 <clickstyle command="arrow" line=" @arrow">@arrow</clickstyle>
 </para>
-<quotation> 
+<quotation endspaces=" "> 
 <para>A quot&textmdash;ation
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Note</quotationtype>
 <para>A Note
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>note</quotationtype>
 <para>A note
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Caution</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Caution</quotationtype>
 <para>Caution
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Important</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Important</quotationtype>
 <para>Important
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Tip</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Tip</quotationtype>
 <para>a Tip
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Warning</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Warning</quotationtype>
 <para>a Warning.
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>something <accent type="acute" 
bracketed="off">e</accent> &tex;</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>something <accent 
type="acute" bracketed="off">e</accent> &tex;</quotationtype>
 <para>The something <accent type="acute" bracketed="off">e</accent> &tex; is 
here.
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>&arobase; at the end of line <spacecmd 
type="nl"/></quotationtype><para>A &arobase; at the end of the 
&arobase;quotation line.
+<quotation spaces=" " endspaces=" "><quotationtype>&arobase; at the end of 
line <spacecmd type="nl"/></quotationtype><para>A &arobase; at the end of the 
&arobase;quotation line.
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>something, other thing</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>something, other 
thing</quotationtype>
 <para>something, other thing
 </para></quotation>
 
-<quotation spaces=" "><quotationtype>Note, the note</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Note, the 
note</quotationtype>
 <para>Note, the note
 </para></quotation>
 
-<quotation>
+<quotation endspaces=" ">
 </quotation>
 
-<quotation spaces=" "><quotationtype>Empty</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>Empty</quotationtype>
 </quotation>
 
-<quotation spaces=" "><quotationtype><asis></asis></quotationtype>
+<quotation spaces=" " endspaces=" 
"><quotationtype><asis></asis></quotationtype>
 </quotation>
 
-<quotation spaces=" "><quotationtype>&linebreak;</quotationtype>
+<quotation spaces=" " endspaces=" "><quotationtype>&linebreak;</quotationtype>
 </quotation>
 
 
-<itemize commandarg="bullet">
+<itemize commandarg="bullet" endspaces=" ">
 <listitem spaces=" "><prepend>&bullet;</prepend><para>i&textndash;temize
 </para></listitem></itemize>
 
-<itemize spaces=" "><itemprepend>+</itemprepend>
+<itemize spaces=" " endspaces=" "><itemprepend>+</itemprepend>
 <listitem spaces=" "><prepend>+</prepend><para>i&textndash;tem +
 </para></listitem></itemize>
 
-<itemize commandarg="bullet" spaces=" "><itemprepend><formattingcommand 
command="bullet" /></itemprepend>
+<itemize commandarg="bullet" spaces=" " endspaces=" 
"><itemprepend><formattingcommand command="bullet" /></itemprepend>
 <listitem spaces=" "><prepend>&bullet;</prepend><para>b&textndash;ullet
 </para></listitem></itemize>
 
-<itemize commandarg="minus" spaces=" "><itemprepend><formattingcommand 
command="minus" /></itemprepend>
+<itemize commandarg="minus" spaces=" " endspaces=" 
"><itemprepend><formattingcommand command="minus" /></itemprepend>
 <listitem spaces=" "><prepend>&minus;</prepend><para>minu&textndash;s
 </para></listitem></itemize>
 
-<itemize commandarg="emph" spaces=" ">
+<itemize commandarg="emph" spaces=" " endspaces=" ">
 <listitem spaces=" "><prepend></prepend><para>e&textndash;mph item
 </para></listitem></itemize>
 
-<itemize spaces=" "><itemprepend><emph>after emph</emph></itemprepend>
+<itemize spaces=" " endspaces=" "><itemprepend><emph>after 
emph</emph></itemprepend>
 <beforefirstitem><!-- c comment in itemize -->
 </beforefirstitem><listitem spaces=" "><prepend><emph>after 
emph</emph></prepend><para>e&textndash;mph item
 </para></listitem></itemize>
 
-<itemize spaces=" "><itemprepend>&bullet; a&textndash;n itemize 
line</itemprepend>
+<itemize spaces=" " endspaces=" "><itemprepend>&bullet; a&textndash;n itemize 
line</itemprepend>
 <beforefirstitem><cindex index="cp"><indexterm index="cp">index entry within 
itemize</indexterm></cindex>
 </beforefirstitem><listitem spaces=" "><prepend>&bullet; a&textndash;n itemize 
line</prepend><para>i&textndash;tem 1
 </para></listitem><listitem spaces=" "><prepend>&bullet; a&textndash;n itemize 
line</prepend><para>i&textndash;tem 2
 </para></listitem></itemize>
 
-<enumerate first="1">
+<enumerate first="1" endspaces=" ">
 <listitem spaces=" "><para>e&textndash;numerate
 </para></listitem></enumerate>
 
-<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction 
value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions line=" 0.4 0.6 
"><columnfraction value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
 <thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable 
headitem </para></entry><entry command="tab" spaces=" "><para>another tab
 </para></entry></row></thead><tbody><row><entry command="item" spaces=" 
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces=" 
"><para>multitable tab
 <!-- c comment in multitable -->
@@ -2248,52 +2248,52 @@
 </para></entry></row><row><entry command="item" spaces=" "><para>lone 
mu&textndash;ltitable item
 </para></entry></row></tbody></multitable>
 
-<multitable spaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype> <columnprototype 
bracketed="on">bidule</columnprototype></columnprototypes>
+<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype> <columnprototype 
bracketed="on">bidule</columnprototype></columnprototypes>
 <tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry 
command="tab" spaces=" "><para>bidule
 </para></entry></row></tbody></multitable>
 
-<example>
+<example endspaces=" ">
 <pre xml:space="preserve">e--xample  some
    text
 </pre></example>
 
-<smallexample>
+<smallexample endspaces=" ">
 <pre xml:space="preserve">s--mallexample
 </pre></smallexample>
 
-<display> 
+<display endspaces=" "> 
 <pre xml:space="preserve">d&textndash;isplay
 </pre></display>
 
-<smalldisplay>
+<smalldisplay endspaces=" ">
 <pre xml:space="preserve">s&textndash;malldisplay
 </pre></smalldisplay>
 
-<lisp>
+<lisp endspaces=" ">
 <pre xml:space="preserve">l--isp
 </pre></lisp>
 
-<smalllisp>
+<smalllisp endspaces=" ">
 <pre xml:space="preserve">s--malllisp
 </pre></smalllisp>
 
-<format>
+<format endspaces=" ">
 <pre xml:space="preserve">f&textndash;ormat
 </pre></format>
 
-<smallformat>
+<smallformat endspaces=" ">
 <pre xml:space="preserve">s&textndash;mallformat
 </pre></smallformat>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;effn
 </para></definitionitem></deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
 <definitionitem><para>def&textndash;fn
 </para></definitionitem></deffn>
  
-<deffn spaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
 <cindex index="cp"><indexterm index="cp">index entry within 
deffn</indexterm></cindex>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
@@ -2318,89 +2318,89 @@
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory> 
<deffunction>deffnx</deffunction> <defparam>before</defparam> 
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
 </deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction></definitionterm>
 </deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction> <defparam>with</defparam> 
<defparam>deffnx</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction> <defparam>with</defparam> 
<defparam>deffnx</defparam></definitionterm>
 <!-- c comment between deffn and deffnx -->
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">deffnx</indexterm><defcategory>empty</defcategory> 
<deffunction>deffnx</deffunction></definitionterm></deffnx>
 </deffn>
 
-<deffn spaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <definitionitem><!-- c comment -->
 <para>text in def item for second def item
 </para></definitionitem></deffn>
 
-<defvr spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
+<defvr spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efvr
 </para></definitionitem></defvr>
 
-<deftypefn spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefn
 </para></definitionitem></deftypefn>
 
-<deftypeop spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypeop spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypeop
 </para></definitionitem></deftypeop>
 
-<deftypevr spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
+<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevr
 </para></definitionitem></deftypevr>
 
-<defcv spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
+<defcv spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efcv
 </para></definitionitem></defcv>
 
-<defop spaces=" "><definitionterm><indexterm index="fn">d&textndash;efop_name 
on c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defop spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efop
 </para></definitionitem></defop>
 
-<deftp spaces=" "><definitionterm><indexterm 
index="tp">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
+<deftp spaces=" " endspaces=" "><definitionterm><indexterm 
index="tp">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftp
 </para></definitionitem></deftp>
 
-<defun spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efun
 </para></definitionitem></defun>
 
-<defmac spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmac spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmac
 </para></definitionitem></defmac>
 
-<defspec spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efspec
 </para></definitionitem></defspec>
 
-<defvar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+<defvar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
 <definitionitem><para>d&textndash;efvar
 </para></definitionitem></defvar>
 
-<defopt spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
+<defopt spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efopt
 </para></definitionitem></defopt>
 
-<deftypefun spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefun
 </para></definitionitem></deftypefun>
 
-<deftypevar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevar
 </para></definitionitem></deftypevar>
 
-<defivar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+<defivar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efivar
 </para></definitionitem></defivar>
 
-<deftypeivar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;eftypeivar
 </para></definitionitem></deftypeivar>
 
-<defmethod spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmethod
 </para></definitionitem></defmethod>
 
-<deftypemethod spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypemethod
 </para></definitionitem></deftypemethod>
 
@@ -2467,39 +2467,39 @@
 ref</inforefrefname><inforefinfoname spaces=" ">a comma&comma; in 
file</inforefinfoname></inforef>
 </para>
 
-<table commandarg="asis" spaces=" ">
+<table commandarg="asis" spaces=" " endspaces=" ">
 <beforefirstitem><!-- c comment in table -->
 </beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat 
command="asis">a</itemformat></item>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></table>
 
-<vtable commandarg="asis" spaces=" ">
+<vtable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="vr">a</indexterm>a</itemformat></item>
 <!-- c comment between item and itemx -->
 <itemx spaces=" "><itemformat command="asis"><indexterm 
index="vr">b</indexterm>b</itemformat></itemx>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></vtable>
 
-<ftable commandarg="asis" spaces=" ">
+<ftable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="fn">a</indexterm>a</itemformat></item>
 <cindex index="cp"><indexterm index="cp">index entry between item and 
itemx</indexterm></cindex>
 <itemx spaces=" "><itemformat command="asis"><indexterm 
index="fn">b</indexterm>b</itemformat></itemx>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></ftable>
 
-<cartouche>
+<cartouche endspaces=" ">
 <para>c&textndash;artouche
 </para></cartouche>
 
-<group>
+<group endspaces=" ">
 <para>g&textndash;roupe
 </para></group>
 
-<flushleft>
+<flushleft endspaces=" ">
 <para>f&textndash;lushleft
 </para></flushleft>
 
-<flushright>
+<flushright endspaces=" ">
 <para>f&textndash;lushright
 </para></flushright>
 
@@ -2514,15 +2514,15 @@
 
 <para> xml para </para> ''
 
-<html>
+<html endspaces=" ">
 html &textrdquo;
 </html>
 
-<tex>
+<tex endspaces=" ">
 $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ &textrdquo;
 </tex>
 
-<docbook>
+<docbook endspaces=" ">
 docbook &textrdquo;
 </docbook>
 
@@ -2543,7 +2543,7 @@
 
 
 <para>In example.
-</para><example>
+</para><example endspaces=" ">
 <pre xml:space="preserve">
 &lt;
 &gt;
@@ -2744,98 +2744,98 @@
 <code>&arobase;clicksequence&lbrace;click &arobase;click&lbrace;&rbrace; 
A&rbrace;</code> <clicksequence>click <click command="result"/> 
A</clicksequence>
 <clickstyle command="arrow" line=" @arrow">@arrow</clickstyle>
 
-</pre><quotation> 
+</pre><quotation endspaces=" "> 
 <pre xml:space="preserve">A quot---ation
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>Note</quotationtype>
+</pre><quotation spaces=" " endspaces=" "><quotationtype>Note</quotationtype>
 <pre xml:space="preserve">A Note
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>note</quotationtype>
+</pre><quotation spaces=" " endspaces=" "><quotationtype>note</quotationtype>
 <pre xml:space="preserve">A note
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>Caution</quotationtype>
+</pre><quotation spaces=" " endspaces=" 
"><quotationtype>Caution</quotationtype>
 <pre xml:space="preserve">Caution
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>Important</quotationtype>
+</pre><quotation spaces=" " endspaces=" 
"><quotationtype>Important</quotationtype>
 <pre xml:space="preserve">Important
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>Tip</quotationtype>
+</pre><quotation spaces=" " endspaces=" "><quotationtype>Tip</quotationtype>
 <pre xml:space="preserve">a Tip
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>Warning</quotationtype>
+</pre><quotation spaces=" " endspaces=" 
"><quotationtype>Warning</quotationtype>
 <pre xml:space="preserve">a Warning.
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>something <accent type="acute" 
bracketed="off">e</accent> &tex;</quotationtype>
+</pre><quotation spaces=" " endspaces=" "><quotationtype>something <accent 
type="acute" bracketed="off">e</accent> &tex;</quotationtype>
 <pre xml:space="preserve">The something <accent type="acute" 
bracketed="off">e</accent> &tex; is here.
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>&arobase; at the end of line 
<spacecmd type="nl"/></quotationtype><pre xml:space="preserve">A &arobase; at 
the end of the &arobase;quotation line.
+</pre><quotation spaces=" " endspaces=" "><quotationtype>&arobase; at the end 
of line <spacecmd type="nl"/></quotationtype><pre xml:space="preserve">A 
&arobase; at the end of the &arobase;quotation line.
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>something, other 
thing</quotationtype>
+</pre><quotation spaces=" " endspaces=" "><quotationtype>something, other 
thing</quotationtype>
 <pre xml:space="preserve">something, other thing
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>Note, the note</quotationtype>
+</pre><quotation spaces=" " endspaces=" "><quotationtype>Note, the 
note</quotationtype>
 <pre xml:space="preserve">Note, the note
 </pre></quotation>
 <pre xml:space="preserve">
-</pre><quotation>
+</pre><quotation endspaces=" ">
 </quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>Empty</quotationtype>
+</pre><quotation spaces=" " endspaces=" "><quotationtype>Empty</quotationtype>
 </quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype><asis></asis></quotationtype>
+</pre><quotation spaces=" " endspaces=" 
"><quotationtype><asis></asis></quotationtype>
 </quotation>
 <pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>&linebreak;</quotationtype>
+</pre><quotation spaces=" " endspaces=" 
"><quotationtype>&linebreak;</quotationtype>
 </quotation>
 <pre xml:space="preserve">
 
-</pre><itemize commandarg="bullet">
+</pre><itemize commandarg="bullet" endspaces=" ">
 <listitem spaces=" "><prepend>&bullet;</prepend><pre 
xml:space="preserve">i--temize
 </pre></listitem></itemize>
 <pre xml:space="preserve">
-</pre><itemize spaces=" "><itemprepend>+</itemprepend>
+</pre><itemize spaces=" " endspaces=" "><itemprepend>+</itemprepend>
 <listitem spaces=" "><prepend>+</prepend><pre xml:space="preserve">i--tem +
 </pre></listitem></itemize>
 <pre xml:space="preserve">
-</pre><itemize commandarg="bullet" spaces=" "><itemprepend><formattingcommand 
command="bullet" /></itemprepend>
+</pre><itemize commandarg="bullet" spaces=" " endspaces=" 
"><itemprepend><formattingcommand command="bullet" /></itemprepend>
 <listitem spaces=" "><prepend>&bullet;</prepend><pre 
xml:space="preserve">b--ullet
 </pre></listitem></itemize>
 <pre xml:space="preserve">
-</pre><itemize commandarg="minus" spaces=" "><itemprepend><formattingcommand 
command="minus" /></itemprepend>
+</pre><itemize commandarg="minus" spaces=" " endspaces=" 
"><itemprepend><formattingcommand command="minus" /></itemprepend>
 <listitem spaces=" "><prepend>&minus;</prepend><pre 
xml:space="preserve">minu--s
 </pre></listitem></itemize>
 <pre xml:space="preserve">
-</pre><itemize commandarg="emph" spaces=" ">
+</pre><itemize commandarg="emph" spaces=" " endspaces=" ">
 <listitem spaces=" "><prepend></prepend><pre xml:space="preserve">e--mph item
 </pre></listitem></itemize>
 <pre xml:space="preserve">
-</pre><itemize spaces=" "><itemprepend><emph>after emph</emph></itemprepend>
+</pre><itemize spaces=" " endspaces=" "><itemprepend><emph>after 
emph</emph></itemprepend>
 <beforefirstitem><pre xml:space="preserve"><!-- c comment in itemize -->
 </pre></beforefirstitem><listitem spaces=" "><prepend><emph>after 
emph</emph></prepend><pre xml:space="preserve">e--mph item
 </pre></listitem></itemize>
 <pre xml:space="preserve">
-</pre><itemize spaces=" "><itemprepend>&bullet; a--n itemize line</itemprepend>
+</pre><itemize spaces=" " endspaces=" "><itemprepend>&bullet; a--n itemize 
line</itemprepend>
 <beforefirstitem><pre xml:space="preserve"><cindex index="cp"><indexterm 
index="cp">index entry within itemize</indexterm></cindex>
 </pre></beforefirstitem><listitem spaces=" "><prepend>&bullet; a--n itemize 
line</prepend><pre xml:space="preserve">i--tem 1
 </pre></listitem><listitem spaces=" "><prepend>&bullet; a--n itemize 
line</prepend><pre xml:space="preserve">i--tem 2
 </pre></listitem></itemize>
 <pre xml:space="preserve">
-</pre><enumerate first="1">
+</pre><enumerate first="1" endspaces=" ">
 <listitem spaces=" "><pre xml:space="preserve">e--numerate
 </pre></listitem></enumerate>
 <pre xml:space="preserve">
-</pre><multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction 
value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
+</pre><multitable spaces=" " endspaces=" "><columnfractions line=" 0.4 0.6 
"><columnfraction value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
 <thead><row><entry command="headitem" spaces=" "><pre 
xml:space="preserve">mu--ltitable headitem </pre></entry><entry command="tab" 
spaces=" "><pre xml:space="preserve">another tab
 </pre></entry></row></thead><tbody><row><entry command="item" spaces=" "><pre 
xml:space="preserve">mu--ltitable item </pre></entry><entry command="tab" 
spaces=" "><pre xml:space="preserve">multitable tab
 <!-- c comment in multitable -->
@@ -2844,52 +2844,52 @@
 </pre></entry></row><row><entry command="item" spaces=" "><pre 
xml:space="preserve">lone mu--ltitable item
 </pre></entry></row></tbody></multitable>
 <pre xml:space="preserve">
-</pre><multitable spaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype> <columnprototype 
bracketed="on">bidule</columnprototype></columnprototypes>
+</pre><multitable spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">truc</columnprototype> <columnprototype 
bracketed="on">bidule</columnprototype></columnprototypes>
 <tbody><row><entry command="item" spaces=" "><pre xml:space="preserve">truc 
</pre></entry><entry command="tab" spaces=" "><pre xml:space="preserve">bidule
 </pre></entry></row></tbody></multitable>
 <pre xml:space="preserve">
-</pre><example>
+</pre><example endspaces=" ">
 <pre xml:space="preserve">e--xample  some
    text
 </pre></example>
 <pre xml:space="preserve">
-</pre><smallexample>
+</pre><smallexample endspaces=" ">
 <pre xml:space="preserve">s--mallexample
 </pre></smallexample>
 <pre xml:space="preserve">
-</pre><display> 
+</pre><display endspaces=" "> 
 <pre xml:space="preserve">d--isplay
 </pre></display>
 <pre xml:space="preserve">
-</pre><smalldisplay>
+</pre><smalldisplay endspaces=" ">
 <pre xml:space="preserve">s--malldisplay
 </pre></smalldisplay>
 <pre xml:space="preserve">
-</pre><lisp>
+</pre><lisp endspaces=" ">
 <pre xml:space="preserve">l--isp
 </pre></lisp>
 <pre xml:space="preserve">
-</pre><smalllisp>
+</pre><smalllisp endspaces=" ">
 <pre xml:space="preserve">s--malllisp
 </pre></smalllisp>
 <pre xml:space="preserve">
-</pre><format>
+</pre><format endspaces=" ">
 <pre xml:space="preserve">f--ormat
 </pre></format>
 <pre xml:space="preserve">
-</pre><smallformat>
+</pre><smallformat endspaces=" ">
 <pre xml:space="preserve">s--mallformat
 </pre></smallformat>
 <pre xml:space="preserve">
-</pre><deffn spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--effn
 </pre></definitionitem></deffn>
 <pre xml:space="preserve">
-</pre><deffn spaces=" "><definitionterm><indexterm 
index="fn">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">def--fn
 </pre></definitionitem></deffn>
 <pre xml:space="preserve"> 
-</pre><deffn spaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
 <pre xml:space="preserve"><cindex index="cp"><indexterm index="cp">index entry 
within deffn</indexterm></cindex>
 </pre><deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
@@ -2914,89 +2914,89 @@
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory> 
<deffunction>deffnx</deffunction> <defparam>before</defparam> 
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
 </deffn>
 <pre xml:space="preserve">
-</pre><deffn spaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction></definitionterm>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction></definitionterm>
 </deffn>
 <pre xml:space="preserve">
-</pre><deffn spaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction> <defparam>with</defparam> 
<defparam>deffnx</defparam></definitionterm>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">deffn</indexterm><defcategory>empty</defcategory> 
<deffunction>deffn</deffunction> <defparam>with</defparam> 
<defparam>deffnx</defparam></definitionterm>
 <pre xml:space="preserve"><!-- c comment between deffn and deffnx -->
 </pre><deffnx spaces=" "><definitionterm><indexterm 
index="fn">deffnx</indexterm><defcategory>empty</defcategory> 
<deffunction>deffnx</deffunction></definitionterm></deffnx>
 </deffn>
 <pre xml:space="preserve">
-</pre><deffn spaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <definitionitem><pre xml:space="preserve"><!-- c comment -->
 text in def item for second def item
 </pre></definitionitem></deffn>
 <pre xml:space="preserve">
-</pre><defvr spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
+</pre><defvr spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efvr
 </pre></definitionitem></defvr>
 <pre xml:space="preserve">
-</pre><deftypefn spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+</pre><deftypefn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypefn
 </pre></definitionitem></deftypefn>
 <pre xml:space="preserve">
-</pre><deftypeop spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+</pre><deftypeop spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypeop
 </pre></definitionitem></deftypeop>
 <pre xml:space="preserve">
-</pre><deftypevr spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
+</pre><deftypevr spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypevr
 </pre></definitionitem></deftypevr>
 <pre xml:space="preserve">
-</pre><defcv spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
+</pre><defcv spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efcv
 </pre></definitionitem></defcv>
 <pre xml:space="preserve">
-</pre><defop spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defop spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efop
 </pre></definitionitem></defop>
 <pre xml:space="preserve">
-</pre><deftp spaces=" "><definitionterm><indexterm 
index="tp">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
+</pre><deftp spaces=" " endspaces=" "><definitionterm><indexterm 
index="tp">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftp
 </pre></definitionitem></deftp>
 <pre xml:space="preserve">
-</pre><defun spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efun
 </pre></definitionitem></defun>
 <pre xml:space="preserve">
-</pre><defmac spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defmac spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efmac
 </pre></definitionitem></defmac>
 <pre xml:space="preserve">
-</pre><defspec spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defspec spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efspec
 </pre></definitionitem></defspec>
 <pre xml:space="preserve">
-</pre><defvar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+</pre><defvar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efvar
 </pre></definitionitem></defvar>
 <pre xml:space="preserve">
-</pre><defopt spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
+</pre><defopt spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efopt
 </pre></definitionitem></defopt>
 <pre xml:space="preserve">
-</pre><deftypefun spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+</pre><deftypefun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypefun
 </pre></definitionitem></deftypefun>
 <pre xml:space="preserve">
-</pre><deftypevar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+</pre><deftypevar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypevar
 </pre></definitionitem></deftypevar>
 <pre xml:space="preserve">
-</pre><defivar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+</pre><defivar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efivar
 </pre></definitionitem></defivar>
 <pre xml:space="preserve">
-</pre><deftypeivar spaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+</pre><deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypeivar
 </pre></definitionitem></deftypeivar>
 <pre xml:space="preserve">
-</pre><defmethod spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defmethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efmethod
 </pre></definitionitem></defmethod>
 <pre xml:space="preserve">
-</pre><deftypemethod spaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+</pre><deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypemethod
 </pre></definitionitem></deftypemethod>
 <pre xml:space="preserve">
@@ -3063,39 +3063,39 @@
 ref</inforefrefname><inforefinfoname spaces=" ">a comma&comma; in 
file</inforefinfoname></inforef>
 
 
-</pre><table commandarg="asis" spaces=" ">
+</pre><table commandarg="asis" spaces=" " endspaces=" ">
 <beforefirstitem><pre xml:space="preserve"><!-- c comment in table -->
 </pre></beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat 
command="asis">a</itemformat></item>
 </tableterm><tableitem><pre xml:space="preserve">l--ine
 </pre></tableitem></tableentry></table>
 <pre xml:space="preserve">
-</pre><vtable commandarg="asis" spaces=" ">
+</pre><vtable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="vr">a</indexterm>a</itemformat></item>
 <pre xml:space="preserve"><!-- c comment between item and itemx -->
 </pre><itemx spaces=" "><itemformat command="asis"><indexterm 
index="vr">b</indexterm>b</itemformat></itemx>
 </tableterm><tableitem><pre xml:space="preserve">l--ine
 </pre></tableitem></tableentry></vtable>
 <pre xml:space="preserve">
-</pre><ftable commandarg="asis" spaces=" ">
+</pre><ftable commandarg="asis" spaces=" " endspaces=" ">
 <tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm 
index="fn">a</indexterm>a</itemformat></item>
 <pre xml:space="preserve"><cindex index="cp"><indexterm index="cp">index entry 
between item and itemx</indexterm></cindex>
 </pre><itemx spaces=" "><itemformat command="asis"><indexterm 
index="fn">b</indexterm>b</itemformat></itemx>
 </tableterm><tableitem><pre xml:space="preserve">l--ine
 </pre></tableitem></tableentry></ftable>
 <pre xml:space="preserve">
-</pre><cartouche>
+</pre><cartouche endspaces=" ">
 <pre xml:space="preserve">c--artouche
 </pre></cartouche>
 <pre xml:space="preserve">
-</pre><group>
+</pre><group endspaces=" ">
 <pre xml:space="preserve">g--roupe
 </pre></group>
 <pre xml:space="preserve">
-</pre><flushleft>
+</pre><flushleft endspaces=" ">
 <pre xml:space="preserve">f--lushleft
 </pre></flushleft>
 <pre xml:space="preserve">
-</pre><flushright>
+</pre><flushright endspaces=" ">
 <pre xml:space="preserve">f--lushright
 </pre></flushright>
 <pre xml:space="preserve">
@@ -3110,15 +3110,15 @@
 <pre xml:space="preserve">
 <para> xml para </para> ''
 
-<html>
+<html endspaces=" ">
 html ''
 </html>
 
-<tex>
+<tex endspaces=" ">
 $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
 </tex>
 
-<docbook>
+<docbook endspaces=" ">
 docbook ''
 </docbook>
 
@@ -3177,8 +3177,8 @@
 
 <para><footnote><para>in footnote</para></footnote>
 </para>
-<format>
-<menu> 
+<format endspaces=" ">
+<menu endspaces=" "> 
 <menuentry leadingtext="* "><menunode separator=":: 
">s--ect&comma;ion</menunode><menudescription><pre 
xml:space="preserve">s&textndash;ect&comma;ion
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 Menu comment
@@ -3190,10 +3190,10 @@
 <node name="s_002d_002dect_002cion" spaces=" 
"><nodename>s--ect&comma;ion</nodename><nodeup 
automatic="on">chapter</nodeup></node>
 <section spaces=" "><sectiontitle>A section</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator=":: 
">subsection</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
-</pre></menucomment><detailmenu>
+</pre></menucomment><detailmenu endspaces=" ">
 <menucomment><pre xml:space="preserve">In detailmenu
 
 </pre></menucomment><menuentry leadingtext="* "><menunode 
separator="::">subsubsection ``simple-double--</menunode><menudescription><pre 
xml:space="preserve">
@@ -3204,7 +3204,7 @@
 <node name="subsection" spaces=" "><nodename>subsection</nodename><nodeup 
automatic="on">s--ect&comma;ion</nodeup></node>
 <subsection spaces=" "><sectiontitle>subsection</sectiontitle>
 
-<menu>
+<menu endspaces=" ">
 <menuentry leadingtext="* "><menunode separator="::">subsubsection 
``simple-double--</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry><menuentry leadingtext="* "><menunode 
separator="::">subsubsection three---four----''</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>

Index: t/results/xml_tests/comments_end_lines.pl
===================================================================
RCS file: t/results/xml_tests/comments_end_lines.pl
diff -N t/results/xml_tests/comments_end_lines.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/xml_tests/comments_end_lines.pl   3 Sep 2012 21:58:49 -0000       
1.1
@@ -0,0 +1,1551 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'comments_end_lines'} = {
+  'contents' => [
+    {
+      'cmdname' => 'itemize',
+      'contents' => [
+        {
+          'extra' => {
+            'command' => {}
+          },
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'cmdname' => 'item',
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'itemize it
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'paragraph'
+            }
+          ],
+          'extra' => {
+            'item_number' => 1,
+            'spaces_after_command' => {}
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 2,
+            'macro' => ''
+          },
+          'parent' => {}
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'itemize'
+                },
+                {
+                  'parent' => {},
+                  'text' => '  ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comment itemize
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'itemize',
+            'spaces_after_command' => {},
+            'text_arg' => 'itemize'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'block_command_line_contents' => [
+          [
+            {
+              'cmdname' => 'bullet',
+              'parent' => {},
+              'type' => 'command_as_argument'
+            }
+          ]
+        ],
+        'command_as_argument' => {},
+        'end_command' => {},
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 1,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'enumerate',
+      'contents' => [
+        {
+          'extra' => {
+            'command' => {}
+          },
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'enumerate'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'enumerate',
+            'spaces_after_command' => {},
+            'text_arg' => 'enumerate'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 6,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'end_command' => {},
+        'enumerate_specification' => 1,
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 5,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'cmdname' => 'asis',
+              'parent' => {},
+              'type' => 'command_as_argument'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'space_at_end_block_command'
+            }
+          ],
+          'parent' => {},
+          'type' => 'block_line_arg'
+        }
+      ],
+      'cmdname' => 'table',
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'contents' => [
+                {
+                  'args' => [
+                    {
+                      'contents' => [
+                        {
+                          'extra' => {
+                            'command' => {}
+                          },
+                          'parent' => {},
+                          'text' => ' ',
+                          'type' => 'empty_spaces_after_command'
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'it'
+                        },
+                        {
+                          'parent' => {},
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
+                      ],
+                      'parent' => {},
+                      'type' => 'misc_line_arg'
+                    }
+                  ],
+                  'cmdname' => 'item',
+                  'extra' => {
+                    'misc_content' => [
+                      {}
+                    ],
+                    'spaces_after_command' => {}
+                  },
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 9,
+                    'macro' => ''
+                  },
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'table_term'
+            }
+          ],
+          'parent' => {},
+          'type' => 'table_entry'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'table'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' table
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'table',
+            'spaces_after_command' => {},
+            'text_arg' => 'table'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 10,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'block_command_line_contents' => [
+          [
+            {}
+          ]
+        ],
+        'command_as_argument' => {},
+        'end_command' => {},
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 8,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'quotation',
+      'contents' => [
+        {
+          'extra' => {
+            'command' => {}
+          },
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'Quot no arg
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'quotation'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' quot no arg
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'quotation',
+            'spaces_after_command' => {},
+            'text_arg' => 'quotation'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 14,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'end_command' => {},
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 12,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'group',
+      'contents' => [
+        {
+          'extra' => {
+            'command' => {}
+          },
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'in gr
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'group'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'group',
+            'spaces_after_command' => {},
+            'text_arg' => 'group'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 18,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'end_command' => {},
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 16,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'example',
+      'contents' => [
+        {
+          'extra' => {
+            'command' => {}
+          },
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'in ex
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'preformatted'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'example'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'example',
+            'spaces_after_command' => {},
+            'text_arg' => 'example'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 22,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'end_command' => {},
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 20,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'command' => {}
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'empty_spaces_after_command'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '0.4 0.6'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'misc_line_arg'
+                }
+              ],
+              'cmdname' => 'columnfractions',
+              'extra' => {
+                'misc_args' => [
+                  '0.4',
+                  '0.6'
+                ],
+                'spaces_after_command' => {}
+              },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 24,
+                'macro' => ''
+              },
+              'parent' => {}
+            }
+          ],
+          'parent' => {},
+          'type' => 'block_line_arg'
+        }
+      ],
+      'cmdname' => 'multitable',
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'contents' => [
+                {
+                  'cmdname' => 'item',
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'command' => {}
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'empty_spaces_after_command'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'a '
+                        }
+                      ],
+                      'parent' => {},
+                      'type' => 'paragraph'
+                    }
+                  ],
+                  'extra' => {
+                    'cell_number' => 1,
+                    'spaces_after_command' => {}
+                  },
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 25,
+                    'macro' => ''
+                  },
+                  'parent' => {}
+                },
+                {
+                  'cmdname' => 'tab',
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'command' => {}
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'empty_spaces_after_command'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'parent' => {},
+                          'text' => 'b
+'
+                        }
+                      ],
+                      'parent' => {},
+                      'type' => 'paragraph'
+                    }
+                  ],
+                  'extra' => {
+                    'cell_number' => 2,
+                    'spaces_after_command' => {}
+                  },
+                  'line_nr' => {},
+                  'parent' => {}
+                }
+              ],
+              'extra' => {
+                'row_number' => 1
+              },
+              'parent' => {},
+              'type' => 'row'
+            }
+          ],
+          'parent' => {},
+          'type' => 'multitable_body'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'multitable'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'multitable',
+            'spaces_after_command' => {},
+            'text_arg' => 'multitable'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 26,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'columnfractions' => [],
+        'end_command' => {},
+        'max_columns' => 2,
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {},
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'f'
+            }
+          ],
+          'parent' => {},
+          'type' => 'block_line_arg'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'g'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'space_at_end_block_command'
+            }
+          ],
+          'parent' => {},
+          'type' => 'block_line_arg'
+        }
+      ],
+      'cmdname' => 'float',
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'In f
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'float'
+                },
+                {
+                  'parent' => {},
+                  'text' => '  ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'float',
+            'spaces_after_command' => {},
+            'text_arg' => 'float'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 30,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'block_command_line_contents' => [
+          [
+            {}
+          ],
+          [
+            {}
+          ]
+        ],
+        'end_command' => {},
+        'node_content' => [
+          {}
+        ],
+        'normalized' => 'g',
+        'spaces_after_command' => {},
+        'type' => {
+          'content' => [
+            {}
+          ],
+          'normalized' => 'f'
+        }
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 28,
+        'macro' => ''
+      },
+      'number' => 1,
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'flushright',
+      'contents' => [
+        {
+          'extra' => {
+            'command' => {}
+          },
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'flushright
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'flushright'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'flushright',
+            'spaces_after_command' => {},
+            'text_arg' => 'flushright'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 34,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'end_command' => {},
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 32,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'raggedright',
+      'contents' => [
+        {
+          'extra' => {
+            'command' => {}
+          },
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'raggedright
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'raggedright'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' comm
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'raggedright',
+            'spaces_after_command' => {},
+            'text_arg' => 'raggedright'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 38,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'end_command' => {},
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 36,
+        'macro' => ''
+      },
+      'parent' => {}
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'spaces_after_command'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'extra'}{'spaces_after_command'}
 = $result_trees{'comments_end_lines'}{'contents'}[2]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[3]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[4];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[4];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[4];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[4];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[4];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'command_as_argument'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[4]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'extra'}{'spaces_after_command'}
 = $result_trees{'comments_end_lines'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[4]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[5]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[6];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[6];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[6];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[6];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[6];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'extra'}{'spaces_after_command'}
 = $result_trees{'comments_end_lines'}{'contents'}[6]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[6]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[7]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[8];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[8];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[8];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[8];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[8];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'extra'}{'spaces_after_command'}
 = $result_trees{'comments_end_lines'}{'contents'}[8]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[8]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[9]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[10];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[10];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[10];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[10];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[10];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'extra'}{'spaces_after_command'}
 = $result_trees{'comments_end_lines'}{'contents'}[10]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[10]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[11]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[12];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[12];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[12];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[12];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[12];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'columnfractions'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'extra'}{'misc_args'};
+$result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[12]{'line_nr'} = 
$result_trees{'comments_end_lines'}{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'comments_end_lines'}{'contents'}[12]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[13]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[14];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[14];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[14];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[14];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[14];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[14];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'block_command_line_contents'}[1][0]
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[1]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[1]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'comments_end_lines'}{'contents'}[14]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[14]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[15]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[16];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[16];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[16];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[16];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[16];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'extra'}{'spaces_after_command'}
 = $result_trees{'comments_end_lines'}{'contents'}[16]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[16]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[17]{'parent'} = 
$result_trees{'comments_end_lines'};
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[18];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[18];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[1];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[18];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'comments_end_lines'}{'contents'}[18];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[18];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'extra'}{'end_command'} = 
$result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[2];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'extra'}{'spaces_after_command'}
 = $result_trees{'comments_end_lines'}{'contents'}[18]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[18]{'parent'} = 
$result_trees{'comments_end_lines'};
+
+$result_texis{'comments_end_lines'} = '@itemize
address@hidden itemize it
address@hidden itemize  @c comment itemize
+
address@hidden
address@hidden enumerate @c comm
+
address@hidden @asis
address@hidden it
address@hidden table @c table
+
address@hidden
+Quot no arg
address@hidden quotation @c quot no arg
+
address@hidden
+in gr
address@hidden group @c comm
+
address@hidden
+in ex
address@hidden example @c comm
+
address@hidden @columnfractions 0.4 0.6
address@hidden a @tab b
address@hidden multitable @c comm
+
address@hidden f,g
+In f
address@hidden float  @c comm
+
address@hidden
+flushright
address@hidden flushright @c comm
+
address@hidden
+raggedright
address@hidden raggedright @c comm
+';
+
+
+$result_texts{'comments_end_lines'} = 'itemize it
+
+
+it
+
+Quot no arg
+
+in gr
+
+in ex
+
+a b
+
+f, g
+In f
+
+flushright
+
+raggedright
+';
+
+$result_errors{'comments_end_lines'} = [];
+
+
+$result_floats{'comments_end_lines'} = {
+  'f' => [
+    {
+      'cmdname' => 'float',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'float',
+            'text_arg' => 'float'
+          }
+        },
+        'normalized' => 'g',
+        'type' => {
+          'content' => [
+            {
+              'text' => 'f'
+            }
+          ],
+          'normalized' => 'f'
+        }
+      },
+      'number' => 1
+    }
+  ]
+};
+$result_floats{'comments_end_lines'}{'f'}[0]{'extra'}{'end_command'}{'extra'}{'command'}
 = $result_floats{'comments_end_lines'}{'f'}[0];
+
+
+
+$result_converted{'xml'}->{'comments_end_lines'} = '<itemize 
commandarg="bullet" endspaces=" ">
+<listitem spaces=" "><prepend>&bullet;</prepend><para>itemize it
+</para></listitem></itemize>  <!-- c comment itemize -->
+
+<enumerate first="1" endspaces=" ">
+</enumerate> <!-- c comm -->
+
+<table commandarg="asis" spaces=" " endspaces=" ">
+<tableentry><tableterm><item spaces=" "><itemformat 
command="asis">it</itemformat></item>
+</tableterm></tableentry></table> <!-- c table -->
+
+<quotation endspaces=" ">
+<para>Quot no arg
+</para></quotation> <!-- c quot no arg -->
+
+<group endspaces=" ">
+<para>in gr
+</para></group> <!-- c comm -->
+
+<example endspaces=" ">
+<pre xml:space="preserve">in ex
+</pre></example> <!-- c comm -->
+
+<multitable spaces=" " endspaces=" "><columnfractions line=" 0.4 
0.6"><columnfraction value="0.4"></columnfraction><columnfraction 
value="0.6"></columnfraction></columnfractions>
+<tbody><row><entry command="item" spaces=" "><para>a </para></entry><entry 
command="tab" spaces=" "><para>b
+</para></entry></row></tbody></multitable> <!-- c comm -->
+
+<float name="g" type="f" spaces=" " endspaces=" 
"><floattype>f</floattype><floatname>g</floatname>
+<para>In f
+</para></float>  <!-- c comm -->
+
+<flushright endspaces=" ">
+<para>flushright
+</para></flushright> <!-- c comm -->
+
+<raggedright endspaces=" ">
+<para>raggedright
+</para></raggedright> <!-- c comm -->
+';
+
+1;

Index: t/results/xml_tests/comments_on_misc_command_line.pl
===================================================================
RCS file: t/results/xml_tests/comments_on_misc_command_line.pl
diff -N t/results/xml_tests/comments_on_misc_command_line.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/xml_tests/comments_on_misc_command_line.pl        3 Sep 2012 
21:58:50 -0000       1.1
@@ -0,0 +1,410 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'comments_on_misc_command_line'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => '  ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'setfilename name'
+            },
+            {
+              'parent' => {},
+              'text' => '  ',
+              'type' => 'spaces_at_end'
+            },
+            {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' setfilename (text)
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'parent' => {}
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'setfilename',
+      'extra' => {
+        'spaces_after_command' => {},
+        'text_arg' => 'setfilename name'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 1,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'phoo,;,:'
+            },
+            {
+              'parent' => {},
+              'text' => '  ',
+              'type' => 'spaces_at_end'
+            },
+            {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' definfoenclose (number)
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'parent' => {}
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'definfoenclose',
+      'extra' => {
+        'misc_args' => [
+          'phoo',
+          ';',
+          ':'
+        ],
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 2,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'none'
+            },
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'spaces_at_end'
+            },
+            {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' c (number)
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'parent' => {}
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'firstparagraphindent',
+      'extra' => {
+        'misc_args' => [
+          'none'
+        ],
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 3,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => ' @c raisesections (skipline)
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'raisesections',
+      'parent' => {}
+    },
+    {
+      'cmdname' => 'insertcopying',
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 5,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '  '
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => '  (noarg)
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'comment',
+      'parent' => {}
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => '200mm'
+            },
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'spaces_at_end'
+            },
+            {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' pagesizes  (line)
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'parent' => {}
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'pagesizes',
+      'extra' => {
+        'misc_content' => [
+          {}
+        ],
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 6,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => ' @thispage @| aaa @c everyheading (lineraw)
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'everyheading',
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'indent',
+      'extra' => {
+        'spaces_after_command' => {
+          'extra' => {
+            'command' => {}
+          },
+          'parent' => {},
+          'text' => ' ',
+          'type' => 'empty_spaces_after_command'
+        }
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 9,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {},
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => ' indent (skipspace)
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'c',
+      'parent' => {}
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'Para.
+'
+        }
+      ],
+      'extra' => {
+        'indent' => 1
+      },
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[1];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[1]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[2];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[2]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[3];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[3]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[4]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[5]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[6];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[6]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[3];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[7];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[7]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[8];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[8]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[9]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[10]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[10];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[10]{'extra'}{'spaces_after_command'}{'parent'}
 = $result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[10]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[11] = 
$result_trees{'comments_on_misc_command_line'}{'contents'}[10]{'extra'}{'spaces_after_command'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[12];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[12]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+$result_trees{'comments_on_misc_command_line'}{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_misc_command_line'}{'contents'}[13];
+$result_trees{'comments_on_misc_command_line'}{'contents'}[13]{'parent'} = 
$result_trees{'comments_on_misc_command_line'};
+
+$result_texis{'comments_on_misc_command_line'} = '@setfilename  setfilename 
name  @c setfilename (text)
address@hidden phoo,;,:  @c definfoenclose (number)
address@hidden none @c c (number)
address@hidden @c raisesections (skipline)
address@hidden  @comment  (noarg)
address@hidden 200mm @c pagesizes  (line)
address@hidden @thispage @| aaa @c everyheading (lineraw)
+
address@hidden @c indent (skipspace)
+Para.
+';
+
+
+$result_texts{'comments_on_misc_command_line'} = '  
+Para.
+';
+
+$result_errors{'comments_on_misc_command_line'} = [];
+
+
+
+$result_converted{'xml'}->{'comments_on_misc_command_line'} = '<setfilename 
file="setfilename name" spaces="  ">setfilename name  </setfilename><!-- c 
setfilename (text) -->
+<definfoenclose command="phoo" open=";" close=":" line=" phoo,;,:  
"></definfoenclose><!-- c definfoenclose (number) -->
+<firstparagraphindent value="none" line=" none "></firstparagraphindent><!-- c 
c (number) -->
+<raisesections line=" @c raisesections (skipline)"></raisesections>
+<insertcopying></insertcopying>  <!-- comment  (noarg) -->
+<pagesizes spaces=" ">200mm </pagesizes><!-- c pagesizes  (line) -->
+<everyheading> @thispage @| aaa @c everyheading (lineraw)</everyheading>
+
+<indent></indent> <!-- c indent (skipspace) -->
+<para>Para.
+</para>';
+
+1;

Index: t/results/xml_tests/raw_and_comments.pl
===================================================================
RCS file: t/results/xml_tests/raw_and_comments.pl
diff -N t/results/xml_tests/raw_and_comments.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/xml_tests/raw_and_comments.pl     3 Sep 2012 21:58:50 -0000       
1.1
@@ -0,0 +1,313 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'raw_and_comments'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => '  ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => ' comment
+',
+                  'type' => 'misc_arg'
+                }
+              ],
+              'cmdname' => 'c',
+              'parent' => {}
+            }
+          ],
+          'parent' => {},
+          'type' => 'block_line_arg'
+        }
+      ],
+      'cmdname' => 'tex',
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'in <tex>
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'rawpreformatted'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'tex'
+                },
+                {
+                  'parent' => {},
+                  'text' => '  ',
+                  'type' => 'spaces_at_end'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' other comment
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'comment',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command' => {},
+            'command_argument' => 'tex',
+            'spaces_after_command' => {},
+            'text_arg' => 'tex'
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'end_command' => {},
+        'spaces_after_command' => {}
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 1,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'Para
+'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => ' in xml comment
+',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'c',
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'block_line_arg'
+            }
+          ],
+          'cmdname' => 'xml',
+          'contents' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => '<in>
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'rawpreformatted'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'command' => {}
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'empty_spaces_after_command'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => 'xml'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'spaces_at_end'
+                    },
+                    {
+                      'args' => [
+                        {
+                          'parent' => {},
+                          'text' => ' end xml comment
+',
+                          'type' => 'misc_arg'
+                        }
+                      ],
+                      'cmdname' => 'comment',
+                      'parent' => {}
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'misc_line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command' => {},
+                'command_argument' => 'xml',
+                'spaces_after_command' => {},
+                'text_arg' => 'xml'
+              },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 8,
+                'macro' => ''
+              },
+              'parent' => {}
+            }
+          ],
+          'extra' => {
+            'end_command' => {},
+            'spaces_after_command' => {}
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 6,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'raw_and_comments'}{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'raw_and_comments'}{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'extra'}{'end_command'} = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'extra'}{'spaces_after_command'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[0]{'parent'} = 
$result_trees{'raw_and_comments'};
+$result_trees{'raw_and_comments'}{'contents'}[1]{'parent'} = 
$result_trees{'raw_and_comments'};
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[2];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[2];
+$result_trees{'raw_and_comments'}{'contents'}[2]{'parent'} = 
$result_trees{'raw_and_comments'};
+
+$result_texis{'raw_and_comments'} = '@tex  @c comment
+in <tex>
address@hidden tex  @comment other comment
+
+Para
address@hidden @c in xml comment
+<in>
address@hidden xml  @comment end xml comment
+';
+
+
+$result_texts{'raw_and_comments'} = '
+Para
+';
+
+$result_errors{'raw_and_comments'} = [];
+
+
+
+$result_converted{'xml'}->{'raw_and_comments'} = '<tex spaces="  " endspaces=" 
"><!-- c comment -->
+in &lt;tex&gt;
+</tex>  <!-- comment other comment -->
+
+<para>Para
+<in>
+</para>';
+
+1;



reply via email to

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