[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Tue, 24 Dec 2024 10:15:59 -0500 (EST) |
branch: master
commit d93407ca3eb9afb20a015a0ebbfe75920ecddd33
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Nov 14 10:26:00 2024 +0100
root line commands in 'argument' container in contents
* tp/Texinfo/Common.pm (is_content_empty), tp/Texinfo/XS/main/utils.c
(is_content_empty): ignore argument type.
* tp/Texinfo/XS/convert/format_html.c (html_open_quotation_command):
remove incorrect const.
* tp/Texinfo/Common.pm (get_label_element), tp/Texinfo/XS/main/utils.c
(get_label_element), tp/Texinfo/ParserNonXS.pm (_end_line_misc_line)
(_check_valid_nesting, _handle_line_command)
(_process_remaining_on_line, _parse_line_command_args),
tp/Texinfo/Structuring.pm (check_nodes_are_referenced, nodes_tree)
(new_node_menu_entry, new_block_command, new_complete_node_menu)
(_print_down_menus), tp/Texinfo/Transformations.pm
(fill_gaps_in_sectioning, _new_node)
(_get_non_automatic_nodes_with_sections),
tp/Texinfo/XS/parsetexi/end_line.c (parse_line_command_args)
(end_line_misc_line), tp/Texinfo/XS/parsetexi/handle_commands.c
(handle_line_command), tp/Texinfo/XS/parsetexi/parser.c
(check_valid_nesting, process_remaining_on_line),
tp/Texinfo/XS/structuring_transfo/structuring.c (new_block_command)
(check_nodes_are_referenced, complete_node_tree_with_menus, nodes_tree)
(new_node_menu_entry, new_complete_node_menu, print_down_menus),
tp/Texinfo/XS/structuring_transfo/transformations.c
(fill_gaps_in_sectioning, new_node)
(insert_nodes_for_sectioning_commands)
(get_non_automatic_nodes_with_sections): put arguments of root line
commands (@node, sectioning commands) in the first content in the
argument container type, remove args.
* tp/Texinfo/Convert/Converter.pm
(normalized_sectioning_command_filename, set_output_units_files)
(format_comment_or_return_end_line, sort_element_counts),
tp/Texinfo/Convert/DocBook.pm (conversion_output_begin)
(_convert_argument_and_end_line, _convert), tp/Texinfo/Convert/HTML.pm
(_internal_command_tree, _convert_heading_command)
(_file_header_information, _prepare_converted_output_info)
(_node_redirections), tp/Texinfo/Convert/LaTeX.pm (_convert),
tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
tp/Texinfo/Convert/Plaintext.pm (process_footnotes, format_contents)
(_convert), tp/Texinfo/Convert/Texinfo.pm
(root_heading_command_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm
(_convert), tp/Texinfo/Convert/Text.pm (_convert),
tp/Texinfo/XS/convert/convert_html.c (fulltitle_cmds)
(html_prepare_converted_output_info, html_node_redirections),
tp/Texinfo/XS/convert/converter.c
(normalized_sectioning_command_filename),
tp/Texinfo/XS/convert/format_html.c (html_internal_command_tree)
(file_header_information, html_convert_heading_command),
tp/Texinfo/XS/main/convert_to_texinfo.c
(root_heading_command_to_texinfo),
tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
tp/Texinfo/XS/main/node_name_normalization.c
(convert_to_normalized_internal), tp/ext/epub3.pm (epub_finish),
tp/init/chm.pm (chm_init): update conversion code for change in root
commands tree.
---
ChangeLog | 60 +
tp/TODO | 11 +-
tp/Texinfo/Common.pm | 11 +-
tp/Texinfo/Convert/Converter.pm | 19 +-
tp/Texinfo/Convert/DocBook.pm | 26 +-
tp/Texinfo/Convert/HTML.pm | 82 +-
tp/Texinfo/Convert/LaTeX.pm | 18 +-
tp/Texinfo/Convert/NodeNameNormalization.pm | 6 +-
tp/Texinfo/Convert/Plaintext.pm | 27 +-
tp/Texinfo/Convert/Texinfo.pm | 6 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 41 +-
tp/Texinfo/Convert/Text.pm | 22 +-
tp/Texinfo/ParserNonXS.pm | 88 +-
tp/Texinfo/Structuring.pm | 35 +-
tp/Texinfo/Transformations.pm | 23 +-
tp/Texinfo/XS/convert/convert_html.c | 19 +-
tp/Texinfo/XS/convert/converter.c | 13 +-
tp/Texinfo/XS/convert/format_html.c | 105 +-
tp/Texinfo/XS/main/convert_to_texinfo.c | 6 +-
tp/Texinfo/XS/main/convert_to_text.c | 41 +-
tp/Texinfo/XS/main/node_name_normalization.c | 6 +-
tp/Texinfo/XS/main/utils.c | 11 +-
tp/Texinfo/XS/parsetexi/end_line.c | 58 +-
tp/Texinfo/XS/parsetexi/handle_commands.c | 11 +
tp/Texinfo/XS/parsetexi/parser.c | 25 +-
tp/Texinfo/XS/structuring_transfo/structuring.c | 40 +-
.../XS/structuring_transfo/transformations.c | 17 +-
tp/ext/epub3.pm | 3 +-
tp/init/chm.pm | 3 +-
tp/t/results/alias/alias_of_added_index.pl | 110 +-
.../alias_of_added_index_before_added_index.pl | 110 +-
tp/t/results/conditionals/cond.pl | 83 +-
tp/t/results/conditionals/cond_ifhtml_ifinfo.pl | 83 +-
.../conditionals/cond_ifhtml_ifinfo_iftex.pl | 83 +-
tp/t/results/conditionals/cond_info.pl | 83 +-
.../conditionals/cond_info_ifhtml_ifinfo_iftex.pl | 83 +-
.../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl | 83 +-
.../cond_no-ifhtml_no-ifinfo_no-iftex.pl | 83 +-
tp/t/results/conditionals/cond_xml.pl | 83 +-
tp/t/results/conditionals/defcondx_Dbar.pl | 29 +-
tp/t/results/conditionals/defcondx_Ubar.pl | 29 +-
.../results/converters_tests/at_commands_in_raw.pl | 114 +-
tp/t/results/converters_tests/combined_fonts.pl | 108 +-
tp/t/results/converters_tests/commands_in_sc.pl | 116 +-
.../commands_in_settitle_with_title.pl | 108 +-
tp/t/results/converters_tests/commands_in_var.pl | 116 +-
tp/t/results/converters_tests/complex_nestings.pl | 120 +-
.../converters_tests/contents_at_document_begin.pl | 110 +-
.../contents_at_document_begin_inline.pl | 110 +-
.../contents_at_document_begin_separate_element.pl | 110 +-
.../conversion_with_undef_customization.pl | 198 +-
.../converters_tests/definition_commands.pl | 264 +-
tp/t/results/converters_tests/extension_undef.pl | 79 +-
.../results/converters_tests/footnote_no_number.pl | 108 +-
.../footnote_no_number_separate.pl | 108 +-
tp/t/results/converters_tests/form_feeds.pl | 72 +-
.../converters_tests/frenchspacing_and_code.pl | 170 +-
tp/t/results/converters_tests/image_formatting.pl | 108 +-
.../index_entry_in_preformatted.pl | 114 +-
.../indices_in_begin_tables_lists.pl | 248 +-
...ces_in_begin_tables_lists_entries_after_item.pl | 248 +-
tp/t/results/converters_tests/link.pl | 95 +-
tp/t/results/converters_tests/non_empty_part.pl | 431 +-
.../non_empty_part_no_top_node_output.pl | 431 +-
.../printindex_merged_indices_code_style.pl | 118 +-
tp/t/results/converters_tests/ref_in_sectioning.pl | 1827 ++--
.../reference_for_formatting_customizations.pl | 108 +-
.../references_to_top_no_top_output.pl | 136 +-
tp/t/results/converters_tests/refs_formatting.pl | 146 +-
.../converters_tests/sections_and_printindex.pl | 195 +-
.../converters_tests/setfilename_no_extension.pl | 83 +-
.../converters_tests/simplest_test_prefix.pl | 29 +-
.../some_at_commands_in_ref_nodes.pl | 680 +-
.../converters_tests/spaces_in_empty_node_names.pl | 162 +-
.../converters_tests/spaces_in_node_names.pl | 192 +-
.../converters_tests/test_deftypefnnewline.pl | 136 +-
.../test_formatting_customizations.pl | 108 +-
.../converters_tests/things_before_setfilename.pl | 112 +-
tp/t/results/converters_tests/top_in_ref.pl | 150 +-
.../various_itemize_command_as_argument.pl | 122 +-
.../various_vtable_command_as_argument.pl | 206 +-
.../coverage/punctuation_in_line_commands.pl | 70 +-
.../coverage_braces/contain_plain_text_nestings.pl | 120 +-
tp/t/results/coverage_braces/footnote_no_node.pl | 29 +-
.../coverage_braces/inforef_too_much_args.pl | 31 +-
tp/t/results/coverage_braces/seeentry_no_braces.pl | 110 +-
tp/t/results/coverage_braces/test_image.pl | 58 +-
.../coverage_braces/two_footnotes_in_nodes.pl | 110 +-
.../two_footnotes_in_nodes_separate.pl | 110 +-
.../two_footnotes_in_nodes_separate_no_header.pl | 110 +-
.../def/all_commands_delimiters_printindex.pl | 148 +-
tp/t/results/def/all_commands_printindex.pl | 108 +-
tp/t/results/def/omit_def_space.pl | 62 +-
tp/t/results/def/ref_in_def.pl | 57 +-
tp/t/results/def/space_in_def_for_index.pl | 58 +-
tp/t/results/def/text_block_before_defline.pl | 110 +-
.../docbook_tests/between_node_and_section.pl | 162 +-
.../docbook_tests/multiple_documentlanguage.pl | 270 +-
.../docbook_tests/special_docbook_unnumbered.pl | 278 +-
tp/t/results/epub_tests/chapter_before_top_epub.pl | 137 +-
tp/t/results/epub_tests/section_part_epub.pl | 79 +-
.../setfilename_on_top_and_after_node_epub.pl | 84 +-
tp/t/results/float/anchor_in_caption.pl | 58 +-
tp/t/results/float/cindex_in_caption.pl | 60 +-
.../results/float/comment_space_comand_in_float.pl | 54 +-
tp/t/results/float/complex_float.pl | 152 +-
tp/t/results/float/float_copying.pl | 110 +-
tp/t/results/float/footnote_in_caption.pl | 58 +-
.../results/float/footnote_in_caption_and_error.pl | 58 +-
.../float/numbering_captions_listoffloats.pl | 688 +-
.../float/special_characters_in_float_type.pl | 114 +-
tp/t/results/formats_encodings/accent.pl | 54 +-
.../formats_encodings/accent_argument_non_ascii.pl | 108 +-
.../formats_encodings/accent_enable_encoding.pl | 54 +-
tp/t/results/formats_encodings/accentenc.pl | 54 +-
.../formats_encodings/accentenc_enable_encoding.pl | 54 +-
.../formats_encodings/at_commands_in_refs.pl | 8802 ++++++++++----------
.../at_commands_in_refs_latin1.pl | 8802 ++++++++++----------
.../formats_encodings/at_commands_in_refs_utf8.pl | 8802 ++++++++++----------
.../char_latin1_latin1_in_refs.pl | 346 +-
.../char_latin2_latin2_in_refs.pl | 114 +-
.../char_us_ascii_latin1_in_refs.pl | 346 +-
.../formats_encodings/char_utf8_latin1_in_refs.pl | 346 +-
.../dotless_argument_non_ascii.pl | 108 +-
.../formats_encodings/japanese_shift_jis.pl | 166 +-
.../manual_simple_latin1_with_error.pl | 137 +-
.../manual_simple_utf8_with_error.pl | 137 +-
.../multiple_include_encodings.pl | 438 +-
tp/t/results/formats_encodings/sample_utf8.pl | 230 +-
.../formats_encodings/verb_delimiter_not_ascii.pl | 108 +-
tp/t/results/formats_encodings/weird_accents.pl | 108 +-
.../weird_accents_disable_encoding.pl | 108 +-
tp/t/results/heading/heading_in_copying.pl | 54 +-
tp/t/results/html_tests/U_in_index.pl | 114 +-
.../html_tests/acronym_in_node_and_section.pl | 248 +-
tp/t/results/html_tests/anchor_on_vtable_item.pl | 172 +-
tp/t/results/html_tests/automatic_menus.pl | 216 +-
.../html_tests/base_for_css_info_in_init_test.pl | 54 +-
.../character_number_leading_toc_stoc.pl | 104 +-
tp/t/results/html_tests/check_htmlxref.pl | 439 +-
.../html_tests/check_htmlxref_ignore_ref_top_up.pl | 439 +-
tp/t/results/html_tests/check_htmlxref_menu.pl | 439 +-
.../html_tests/check_htmlxref_no_use_nodes.pl | 439 +-
.../html_tests/command_in_node_redirection.pl | 70 +-
.../command_in_node_redirection_multiple.pl | 70 +-
.../command_in_node_redirection_other_command.pl | 70 +-
.../command_in_node_redirection_same_command.pl | 70 +-
.../command_in_node_redirection_two_commands.pl | 70 +-
tp/t/results/html_tests/contents_at_end.pl | 110 +-
tp/t/results/html_tests/contents_at_end_inline.pl | 110 +-
.../html_tests/contents_at_end_separate_element.pl | 110 +-
.../html_tests/contents_in_middle_chapter.pl | 166 +-
.../contents_in_middle_chapter_inline.pl | 166 +-
.../contents_in_middle_chapter_separate_element.pl | 166 +-
.../html_tests/contents_in_middle_section.pl | 222 +-
.../contents_in_middle_section_inline.pl | 222 +-
.../contents_in_middle_section_separate_element.pl | 222 +-
.../html_tests/contents_with_only_top_node.pl | 29 +-
.../html_tests/css_in_node_redirection_page.pl | 54 +-
.../deftypefnnewline_for_copying_after.pl | 110 +-
.../deftypefnnewline_for_copying_before.pl | 110 +-
tp/t/results/html_tests/documentdescription.pl | 25 +-
tp/t/results/html_tests/double_contents.pl | 166 +-
.../html_tests/double_contents_after_title.pl | 166 +-
.../double_contents_after_title_show_title.pl | 166 +-
...double_contents_after_title_show_title_nodes.pl | 166 +-
tp/t/results/html_tests/double_contents_book.pl | 166 +-
tp/t/results/html_tests/double_contents_chapter.pl | 166 +-
tp/t/results/html_tests/double_contents_inline.pl | 166 +-
.../html_tests/double_contents_inline_chapter.pl | 166 +-
.../html_tests/double_contents_inline_nodes.pl | 166 +-
.../html_tests/double_contents_inline_section.pl | 166 +-
tp/t/results/html_tests/double_contents_nodes.pl | 166 +-
tp/t/results/html_tests/double_contents_section.pl | 166 +-
.../html_tests/double_contents_separate_element.pl | 166 +-
.../double_contents_separate_element_chapter.pl | 166 +-
.../double_contents_separate_element_nodes.pl | 166 +-
.../double_contents_separate_element_section.pl | 166 +-
...sive_self_section_reference_node_no_use_node.pl | 160 +-
.../html_tests/empty_chapter_in_html_title.pl | 98 +-
...y_chapter_in_html_title_no_node_no_use_nodes.pl | 73 +-
.../empty_lines_at_beginning_no_setfilename.pl | 54 +-
.../empty_node_in_html_title_no_sec_name.pl | 98 +-
.../file_name_case_insensitive_conflict_node.pl | 274 +-
...se_insensitive_conflict_node_no_redirections.pl | 274 +-
..._name_case_insensitive_conflict_redirections.pl | 89 +-
.../html_tests/file_name_conflict_with_Top.pl | 108 +-
.../html_tests/file_name_conflict_with_section.pl | 79 +-
.../file_name_conflict_with_user_defined.pl | 158 +-
.../html_tests/filenameconflictwithnonsplit.pl | 54 +-
.../filenameconflictwithspecialelement.pl | 108 +-
tp/t/results/html_tests/float_copying.pl | 122 +-
...otnotestyle_separate_html_text_no_monolithic.pl | 108 +-
.../html_tests/footnotestyle_separate_late.pl | 162 +-
.../html_tests/headings_after_lone_nodes.pl | 346 +-
tp/t/results/html_tests/html_in_copying.pl | 54 +-
.../results/html_tests/index_and_node_same_name.pl | 56 +-
tp/t/results/html_tests/index_below.pl | 87 +-
tp/t/results/html_tests/info_js_dir_html.pl | 104 +-
tp/t/results/html_tests/info_js_dir_html_file.pl | 104 +-
...nfo_js_dir_html_file_js_weblabels_file_undef.pl | 104 +-
tp/t/results/html_tests/info_js_dir_html_text.pl | 104 +-
tp/t/results/html_tests/inline_in_node.pl | 258 +-
tp/t/results/html_tests/letter_command_in_index.pl | 114 +-
tp/t/results/html_tests/menu.pl | 76 +-
.../html_tests/menu_in_documentdescription.pl | 58 +-
tp/t/results/html_tests/menu_in_example.pl | 39 +-
tp/t/results/html_tests/no_content.pl | 110 +-
tp/t/results/html_tests/no_content_do_contents.pl | 110 +-
.../html_tests/no_content_do_contents_inline.pl | 110 +-
.../no_content_do_contents_separate_element.pl | 110 +-
tp/t/results/html_tests/no_content_inline.pl | 110 +-
.../html_tests/no_content_separate_element.pl | 110 +-
tp/t/results/html_tests/node_footnote_end.pl | 216 +-
tp/t/results/html_tests/node_footnote_separated.pl | 216 +-
tp/t/results/html_tests/node_footnote_use_node.pl | 216 +-
.../html_tests/node_footnote_use_node_separate.pl | 216 +-
.../html_tests/nodedescription_description.pl | 224 +-
.../nodedescription_description_no_use_nodes.pl | 224 +-
tp/t/results/html_tests/redirection_same_labels.pl | 295 +-
tp/t/results/html_tests/ref_in_preformatted.pl | 60 +-
.../html_tests/sectioning_check_menu_structure.pl | 1030 +--
.../html_tests/set_unit_file_name_filepath.pl | 104 +-
tp/t/results/html_tests/shortcontents_no_top.pl | 87 +-
tp/t/results/html_tests/shorttitlepage.pl | 110 +-
.../html_tests/simple_only_special_spaces_node.pl | 196 +-
.../html_tests/simplest_test_date_in_header.pl | 29 +-
tp/t/results/html_tests/split_html_text.pl | 104 +-
tp/t/results/html_tests/test_accents_sc_default.pl | 108 +-
.../html_tests/test_accents_sc_default_latin1.pl | 108 +-
.../html_tests/test_accents_sc_default_usascii.pl | 108 +-
.../html_tests/test_accents_sc_enable_encoding.pl | 108 +-
.../test_accents_sc_enable_encoding_latin1.pl | 108 +-
...st_accents_sc_enable_encoding_to_utf8_latin1.pl | 108 +-
...t_accents_sc_enable_encoding_to_utf8_usascii.pl | 108 +-
.../test_accents_sc_enable_encoding_usascii.pl | 108 +-
.../html_tests/test_accents_sc_to_utf8_latin1.pl | 108 +-
.../test_accents_sc_use_numeric_entity.pl | 108 +-
.../test_separated_contents_shortcontents.pl | 162 +-
.../html_tests/test_xrefautomaticsectiontitle.pl | 114 +-
.../test_xrefautomaticsectiontitle_off_first.pl | 114 +-
.../text_before_top_and_contents_after_title.pl | 83 +-
...t_before_top_and_summarycontents_after_title.pl | 83 +-
tp/t/results/html_tests/text_css_info_in_init.pl | 54 +-
tp/t/results/html_tests/titles.pl | 110 +-
.../top_file_name_and_node_name_collision.pl | 137 +-
tp/t/results/html_tests/top_node_top_contents.pl | 50 +-
tp/t/results/html_tests/top_node_up_explicit.pl | 250 +-
.../html_tests/top_node_up_explicit_no_nodes.pl | 250 +-
tp/t/results/html_tests/top_node_up_implicit.pl | 110 +-
.../html_tests/top_node_up_implicit_no_nodes.pl | 110 +-
.../html_tests/transliterated_names_conflicts.pl | 164 +-
.../results/html_tests/undef_split_and_big_rule.pl | 133 +-
.../xhtml_rule_element_already_closed.pl | 104 +-
tp/t/results/htmlxref/htmlxref.pl | 605 +-
.../htmlxref/htmlxref_no_urlprefix_first.pl | 108 +-
tp/t/results/htmlxref/htmlxref_nodes.pl | 605 +-
tp/t/results/htmlxref/htmlxref_only_mono.pl | 605 +-
tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl | 605 +-
tp/t/results/htmlxref/htmlxref_only_split.pl | 605 +-
tp/t/results/htmlxref/htmlxref_only_split_nodes.pl | 605 +-
tp/t/results/include/cpp_line_latin1.pl | 77 +-
tp/t/results/include/cpp_lines.pl | 54 +-
.../macro_and_commands_in_early_commands.pl | 83 +-
tp/t/results/include/macro_in_early_commands.pl | 83 +-
tp/t/results/include/value_expansion_in_include.pl | 54 +-
tp/t/results/indices/complex_recursive_synindex.pl | 58 +-
tp/t/results/indices/def_syn_indices.pl | 120 +-
...default_cp_index_and_one_letter_syncodeindex.pl | Bin 10087 -> 10349 bytes
tp/t/results/indices/double_index_entry.pl | 108 +-
tp/t/results/indices/double_seeentry_seealso.pl | 124 +-
tp/t/results/indices/double_syncodeindex.pl | 56 +-
tp/t/results/indices/empty_added_index_entry.pl | 54 +-
tp/t/results/indices/empty_cindex_entry.pl | 54 +-
tp/t/results/indices/empty_index_entry.pl | 58 +-
tp/t/results/indices/empty_string_index_entry.pl | 64 +-
tp/t/results/indices/encoding_index_ascii.pl | 81 +-
.../encoding_index_ascii_enable_encoding.pl | 81 +-
tp/t/results/indices/encoding_index_latin1.pl | 85 +-
.../encoding_index_latin1_enable_encoding.pl | 85 +-
tp/t/results/indices/encoding_index_utf8.pl | 85 +-
.../indices/encoding_index_utf8_enable_encoding.pl | 85 +-
.../indices/encoding_index_utf8_no_use_unicode.pl | 85 +-
tp/t/results/indices/explicit_sort_key.pl | 79 +-
tp/t/results/indices/ftable_vtable.pl | 72 +-
.../indices/ignored_sort_char_empty_entries.pl | 79 +-
tp/t/results/indices/image_lines_count.pl | Bin 5652 -> 5768 bytes
tp/t/results/indices/image_text_lines_count.pl | Bin 6055 -> 6171 bytes
tp/t/results/indices/index_and_node_same_name.pl | 110 +-
tp/t/results/indices/index_entries_before_nodes.pl | Bin 11507 -> 11739 bytes
tp/t/results/indices/index_entries_locations.pl | 62 +-
.../indices/index_entry_before_first_node.pl | Bin 6138 -> 6254 bytes
tp/t/results/indices/index_entry_before_node.pl | 221 +-
tp/t/results/indices/index_entry_in_footnote.pl | Bin 7028 -> 7144 bytes
.../index_entry_in_footnote_different_node_end.pl | 95 +-
.../indices/index_entry_in_footnote_sections.pl | 110 +-
.../index_entry_in_footnote_sections_separate.pl | 110 +-
.../indices/index_entry_in_footnote_separate.pl | 95 +-
tp/t/results/indices/index_no_node.pl | 145 +-
tp/t/results/indices/index_no_node_no_top.pl | 145 +-
.../indices/index_no_node_no_top_no_node.pl | 145 +-
tp/t/results/indices/index_nodes.pl | 455 +-
.../indices/index_nodes_no_split_no_use_nodes.pl | 455 +-
tp/t/results/indices/index_special_region.pl | 167 +-
.../index_special_region_no_insertcopying.pl | 167 +-
...egion_no_insertcopying_no_titlepage_no_nodes.pl | 167 +-
...l_region_no_insertcopying_titlepage_no_nodes.pl | 167 +-
...copying_titlepage_no_nodes_footnotes_default.pl | 167 +-
.../index_special_region_no_titlepage_no_nodes.pl | 167 +-
.../index_special_region_titlepage_no_nodes.pl | 167 +-
..._region_titlepage_no_nodes_footnotes_default.pl | 167 +-
tp/t/results/indices/index_split.pl | 731 +-
.../indices/index_split_split_chapter_no_nodes.pl | 731 +-
tp/t/results/indices/index_table.pl | 316 +-
.../results/indices/index_table_chapter_no_node.pl | 316 +-
.../multiple_index_text_sortas_seeentry_seealso.pl | 110 +-
tp/t/results/indices/nodes_before_top.pl | 703 +-
.../nodes_before_top_and_sections_chapter.pl | 953 ++-
...odes_before_top_and_sections_chapter_no_node.pl | 953 ++-
...des_before_top_and_sections_unsplit_no_nodes.pl | 953 ++-
.../indices/nodes_before_top_split_chapter.pl | 703 +-
.../nodes_before_top_split_chapter_no_nodes.pl | 703 +-
tp/t/results/indices/print_merged_index.pl | 54 +-
.../indices/printindex_between_node_section.pl | 166 +-
.../indices/printindex_between_part_chapter.pl | 195 +-
.../indices/printindex_index_entry_in_copying.pl | 110 +-
...rintindex_index_entry_in_copying_in_footnote.pl | 110 +-
...ndex_index_entry_in_copying_no_insertcopying.pl | 110 +-
.../indices/printindex_with_space_before.pl | Bin 6953 -> 7215 bytes
.../indices/same_index_entry_merged_indices.pl | 106 +-
tp/t/results/indices/same_only_seealso_seeentry.pl | 122 +-
tp/t/results/indices/same_seealso_seeentry.pl | 124 +-
tp/t/results/indices/seealso_duplicate.pl | 76 +-
tp/t/results/indices/seeentry.pl | 114 +-
tp/t/results/indices/sorted_subentries.pl | 282 +-
tp/t/results/indices/split_chapter_index.pl | 242 +-
tp/t/results/indices/subentries.pl | 162 +-
tp/t/results/indices/subentries_and_comments.pl | 114 +-
tp/t/results/indices/subentry_and_sortas.pl | 114 +-
tp/t/results/indices/subentry_and_sortas_spaces.pl | 134 +-
tp/t/results/indices/syncode_index_print_both.pl | 110 +-
tp/t/results/indices/syncodeindex_to_plain.pl | 56 +-
tp/t/results/indices/transparent_sort_chars.pl | 79 +-
tp/t/results/indices/w_lines_count.pl | Bin 9378 -> 9620 bytes
tp/t/results/info_tests/anchor_and_spaces.pl | 54 +-
tp/t/results/info_tests/anchor_in_command.pl | 29 +-
tp/t/results/info_tests/before_node_and_section.pl | 124 +-
.../info_tests/chinese_mixed_with_en_EUC_CN.pl | 108 +-
tp/t/results/info_tests/colon_in_index_entry.pl | 39 +-
.../info_tests/colons_in_index_entries_and_node.pl | 151 +-
.../colons_in_index_entries_and_node_no_quoting.pl | 151 +-
tp/t/results/info_tests/def_in_copying.pl | 58 +-
tp/t/results/info_tests/direntry_dircategory.pl | 112 +-
.../direntry_dircategory_and_commands.pl | 54 +-
tp/t/results/info_tests/empty_caption.pl | 33 +-
tp/t/results/info_tests/encoding_us_ascii.pl | 29 +-
.../end_of_line_command_in_node_lines.pl | 236 +-
tp/t/results/info_tests/error_in_footnote.pl | 33 +-
tp/t/results/info_tests/file_only_png.pl | Bin 3520 -> 3636 bytes
tp/t/results/info_tests/float_long_captions.pl | 37 +-
tp/t/results/info_tests/float_without_type.pl | 29 +-
tp/t/results/info_tests/image_and_punctuation.pl | Bin 7107 -> 7223 bytes
.../info_tests/image_and_spaces_formatting.pl | 29 +-
tp/t/results/info_tests/image_extension.pl | Bin 4477 -> 4593 bytes
tp/t/results/info_tests/image_in_paragraph.pl | Bin 2999 -> 3115 bytes
tp/t/results/info_tests/image_not_found.pl | 29 +-
tp/t/results/info_tests/image_quotes.pl | Bin 2590 -> 2706 bytes
.../info_tests/image_text_file_only_and_alt.pl | Bin 2714 -> 2830 bytes
tp/t/results/info_tests/index_entry_at_end_node.pl | 168 +-
.../info_tests/invalid_node_name_no_warning.pl | 178 +-
.../info_tests/invalid_node_name_warning.pl | 178 +-
tp/t/results/info_tests/known_encoding.pl | 29 +-
.../multitable_anchor_and_index_entry.pl | 39 +-
.../info_tests/nested_footnotes_separate.pl | 29 +-
.../info_tests/nested_multitable_anchor_index.pl | 37 +-
tp/t/results/info_tests/no_node_but_top.pl | 25 +-
tp/t/results/info_tests/no_top_node.pl | 25 +-
tp/t/results/info_tests/note_in_strong.pl | 29 +-
.../info_tests/note_in_strong_end_of_line.pl | 29 +-
tp/t/results/info_tests/novalidate_empty_refs.pl | 106 +-
.../info_tests/one_node_counted_elements.pl | 79 +-
.../info_tests/paragraphindent_and_preamble.pl | 66 +-
.../paragraphindent_in_preamble_and_in_document.pl | 66 +-
.../info_tests/paragraphindent_not_in_preamble.pl | 66 +-
tp/t/results/info_tests/pxref_test.pl | 45 +-
tp/t/results/info_tests/quote_node_names_info.pl | 631 +-
tp/t/results/info_tests/recursive_down_menu.pl | 110 +-
tp/t/results/info_tests/ref_tests.pl | 57 +-
.../similar_external_and_internal_node.pl | 101 +-
tp/t/results/info_tests/space_at_menu_end.pl | 31 +-
tp/t/results/info_tests/space_in_menu.pl | 110 +-
tp/t/results/info_tests/space_in_setfilename.pl | 25 +-
tp/t/results/info_tests/split_no_copying.pl | 110 +-
tp/t/results/info_tests/split_nocopying.pl | 122 +-
tp/t/results/info_tests/split_nocopying_split.pl | 122 +-
.../info_tests/split_test_before_first_node.pl | 110 +-
.../split_test_before_first_node_no_empty_line.pl | 110 +-
tp/t/results/info_tests/test_index.pl | 347 +-
tp/t/results/info_tests/text_before_node.pl | 94 +-
tp/t/results/info_tests/top_node_normalization.pl | 35 +-
.../info_tests/two_paragraphindent_in_preamble.pl | 66 +-
..._paragraphindent_in_preamble_and_in_document.pl | 66 +-
tp/t/results/info_tests/unknown_encoding.pl | 29 +-
tp/t/results/info_tests/xref_test.pl | 49 +-
.../access_document_name_in_handler.pl | 104 +-
...tton_replacement_and_direction_customization.pl | 104 +-
..._replacement_direction_strings_customization.pl | 104 +-
...utton_replacement_for_special_unit_direction.pl | 104 +-
.../init_files_tests/customize_special_element.pl | 162 +-
.../init_files_tests/customize_translations.pl | 324 +-
.../init_files_tests/directions_string_base.pl | 320 +-
.../init_files_tests/directions_string_undef.pl | 320 +-
.../directions_string_undef_texi2html.pl | 320 +-
.../init_files_tests/documentation_examples.pl | 220 +-
.../documentation_examples_texi2html.pl | 220 +-
.../redefined_buttons_functions.pl | 320 +-
.../ref_for_special_unit_direction.pl | 104 +-
.../special_unit_direction_customization.pl | 104 +-
...est_format_single_footnote_in_inline_content.pl | 112 +-
.../translation_in_parser_in_translation.pl | 110 +-
.../init_files_tests/undefined_node_filename.pl | 54 +-
.../init_files_tests/unknown_custom_variable.pl | 104 +-
tp/t/results/invalid_nestings/footnote_in_ref.pl | 29 +-
tp/t/results/invalid_nestings/ignore_in_xref.pl | 31 +-
tp/t/results/invalid_nestings/ignored_text.pl | 69 +-
tp/t/results/invalid_nestings/in_table.pl | 70 +-
.../invalid_nestings/menu_in_style_command.pl | 31 +-
tp/t/results/invalid_nestings/node_in_copying.pl | 29 +-
.../invalid_nestings/node_in_copying_not_closed.pl | 54 +-
.../invalid_nestings/node_on_index_entry_line.pl | 229 +-
tp/t/results/invalid_nestings/on_node_line.pl | 339 +-
tp/t/results/invalid_nestings/on_section_line.pl | 159 +-
tp/t/results/invalid_nestings/quotation_in_ref.pl | 29 +-
tp/t/results/invalid_nestings/ref_in_ref.pl | 33 +-
.../invalid_nestings/ref_to_top_in_anchor.pl | 31 +-
.../results/invalid_nestings/section_in_copying.pl | 25 +-
.../invalid_nestings/section_in_flushright.pl | 25 +-
.../invalid_nestings/section_in_footnote.pl | 25 +-
tp/t/results/invalid_nestings/section_in_math.pl | 54 +-
.../section_in_nested_block_commands.pl | 25 +-
tp/t/results/invalid_nestings/section_in_table.pl | 29 +-
.../invalid_nestings/section_on_cartouche_line.pl | 54 +-
.../invalid_nestings/section_on_def_line.pl | 29 +-
.../invalid_nestings/section_on_defx_line.pl | 29 +-
.../invalid_nestings/section_on_enumerate_line.pl | 54 +-
.../invalid_nestings/section_on_float_line.pl | 25 +-
.../section_on_index_entry_line.pl | 29 +-
.../invalid_nestings/section_on_itemize_line.pl | 114 +-
.../invalid_nestings/section_on_multitable_line.pl | 83 +-
.../invalid_nestings/section_on_xtable_line.pl | 118 +-
.../style_not_closed_before_first_node.pl | 29 +-
.../style_not_closed_no_newline_root_commands.pl | 110 +-
.../style_not_closed_root_commands.pl | 110 +-
.../unclosed_verb_on_section_line.pl | 53 +-
tp/t/results/invalid_nestings/verbatim_in_ref.pl | 29 +-
.../itemize/inter_item_commands_in_enumerate.pl | 122 +-
.../itemize/inter_item_commands_in_itemize.pl | 122 +-
tp/t/results/languages/appendix_translated.pl | 83 +-
tp/t/results/languages/command_translated.pl | 132 +-
tp/t/results/languages/documentlanguage.pl | 112 +-
.../documentlanguage_generated_master_menu.pl | 270 +-
tp/t/results/languages/documentlanguage_option.pl | 112 +-
tp/t/results/languages/documentlanguage_unknown.pl | 112 +-
.../results/languages/multiple_documentlanguage.pl | 112 +-
tp/t/results/languages/multiple_in_preamble.pl | 112 +-
.../languages/multiple_in_preamble_before_node.pl | 110 +-
tp/t/results/languages/multiple_lang_chapters.pl | 346 +-
.../languages/multiple_lang_chapters_latex.pl | 346 +-
.../languages/multiple_lang_chapters_texi2html.pl | 346 +-
tp/t/results/languages/simple_documentlanguage.pl | 56 +-
tp/t/results/languages/unknown_language.pl | 112 +-
tp/t/results/languages/unknown_region.pl | 56 +-
tp/t/results/latex_tests/anchor_before_top.pl | 110 +-
tp/t/results/latex_tests/anchor_in_copying.pl | 110 +-
.../anchor_in_copying_insertcopying_chap.pl | 112 +-
.../anchor_in_copying_insertcopying_titlepage.pl | 112 +-
...chor_in_copying_insertcopying_titlepage_chap.pl | 112 +-
.../anchor_links_xref_xrefautomaticsectiontitle.pl | 182 +-
.../latex_tests/custom_heading_with_include.pl | 676 +-
.../custom_heading_with_include_in_command.pl | 676 +-
tp/t/results/latex_tests/custom_headings.pl | 195 +-
.../latex_tests/custom_headings_and_comments.pl | 166 +-
.../latex_tests/customize_informative_commands.pl | 25 +-
.../latex_tests/error_in_sectioning_command.pl | 224 +-
tp/t/results/latex_tests/float_and_refs.pl | 226 +-
tp/t/results/latex_tests/fonttextsize.pl | 253 +-
tp/t/results/latex_tests/indices.pl | 124 +-
.../latex_tests/indices_disable_encoding.pl | 124 +-
.../informative_commands_in_top_node.pl | 108 +-
tp/t/results/latex_tests/node_before_top.pl | 139 +-
tp/t/results/latex_tests/pagesizes.pl | 137 +-
tp/t/results/latex_tests/pagetype.pl | 137 +-
tp/t/results/latex_tests/settitle_and_headings.pl | 29 +-
tp/t/results/latex_tests/shorttitlepage.pl | 108 +-
tp/t/results/latex_tests/titlepage_classical.pl | 108 +-
tp/t/results/latex_tests/titlepage_in_top_node.pl | 108 +-
tp/t/results/latex_tests/titlepage_long_title.pl | 108 +-
tp/t/results/latex_tests/titlepage_no_author.pl | 108 +-
tp/t/results/latex_tests/titlepage_no_title.pl | 108 +-
.../titlepage_with_commands_classical.pl | 108 +-
.../latex_tests/top_no_sectioning_command.pl | 85 +-
tp/t/results/layout/navigation.pl | 222 +-
tp/t/results/layout/navigation_chapter.pl | 222 +-
.../results/layout/navigation_chapter_no_header.pl | 222 +-
.../navigation_chapter_no_header_vertical.pl | 222 +-
tp/t/results/layout/navigation_chapter_vertical.pl | 222 +-
tp/t/results/layout/navigation_no_header.pl | 222 +-
.../layout/navigation_no_header_vertical.pl | 222 +-
tp/t/results/layout/navigation_node.pl | 222 +-
tp/t/results/layout/navigation_node_no_header.pl | 222 +-
.../layout/navigation_node_no_header_vertical.pl | 222 +-
tp/t/results/layout/navigation_node_vertical.pl | 222 +-
tp/t/results/layout/navigation_section.pl | 222 +-
.../results/layout/navigation_section_no_header.pl | 222 +-
.../navigation_section_no_header_vertical.pl | 222 +-
tp/t/results/layout/navigation_section_vertical.pl | 222 +-
.../layout/navigation_test_misc_file_collision.pl | 222 +-
.../layout/navigation_test_undef_top_buttons.pl | 222 +-
.../layout/navigation_test_zero_top_buttons.pl | 222 +-
tp/t/results/layout/navigation_vertical.pl | 222 +-
tp/t/results/layout/no_monolithic.pl | 112 +-
tp/t/results/layout/no_monolithic_only_toc_out.pl | 112 +-
.../linemacro/simple_nested_linemacro_calls.pl | 31 +-
tp/t/results/macro/backslash_in_arg.pl | 56 +-
tp/t/results/macro/bib_example.pl | 192 +-
tp/t/results/macro/glossary.pl | 114 +-
.../macro/macro_alias_definfoenclose_defindex.pl | 114 +-
tp/t/results/macro/macro_in_index_commands.pl | 60 +-
tp/t/results/macro/macro_in_misc_commands.pl | 204 +-
...pendix_and_associated_part_in_generated_menu.pl | 324 +-
.../menu/block_commands_in_menu_description.pl | 60 +-
.../menu/commands_in_nodedescriptionblock.pl | 178 +-
tp/t/results/menu/comment_on_menu_line.pl | 81 +-
tp/t/results/menu/detailmenu_on_subnodes.pl | 336 +-
tp/t/results/menu/detailmenu_unknown_node.pl | 31 +-
.../menu/direntry_dircategory_after_first_node.pl | 56 +-
tp/t/results/menu/empty_leading_menu_comment.pl | 33 +-
tp/t/results/menu/empty_menu_description.pl | 35 +-
tp/t/results/menu/empty_menu_entry_name.pl | 58 +-
tp/t/results/menu/entry_after_detailmenu.pl | 87 +-
tp/t/results/menu/example_in_menu_description.pl | 56 +-
tp/t/results/menu/format_menu_undef.pl | 104 +-
tp/t/results/menu/formats_in_menu.pl | 39 +-
tp/t/results/menu/inlineraw_in_menu_description.pl | 56 +-
tp/t/results/menu/invalid_info_menu_entry.pl | 49 +-
.../results/menu/leading_space_before_menu_star.pl | 29 +-
tp/t/results/menu/menu_in_deffn.pl | 33 +-
tp/t/results/menu/menu_in_example.pl | 39 +-
tp/t/results/menu/menu_node_unterminated.pl | 33 +-
tp/t/results/menu/menu_pointing_to_anchor.pl | 56 +-
tp/t/results/menu/menu_title_before_entries.pl | 56 +-
.../results/menu/missing_detailmenu_on_subnodes.pl | 336 +-
tp/t/results/menu/multiple_menus.pl | 37 +-
tp/t/results/menu/no_colon_in_menu.pl | 29 +-
tp/t/results/menu/nodedescription_descriptions.pl | 460 +-
.../menu/nodedescriptionblock_descriptions.pl | 350 +-
.../menu/part_appendix_in_generated_menu.pl | 295 +-
tp/t/results/menu/reference_to_external_manual.pl | 31 +-
tp/t/results/menu/sc_in_menu.pl | 74 +-
.../menu/space_and_commands_in_menu_node.pl | 162 +-
tp/t/results/menu/submenu_in_example.pl | 29 +-
tp/t/results/menu/verb_in_menu_description.pl | 56 +-
.../codequoteundirected_codequotebacktick.pl | 108 +-
.../misc_commands/comment_space_command_on_line.pl | 180 +-
.../no_empty_line_between_headings.pl | 79 +-
tp/t/results/misc_commands/nodedescription.pl | 112 +-
tp/t/results/misc_commands/ref_in_center.pl | 110 +-
tp/t/results/misc_commands/test_allowcodebreaks.pl | 54 +-
.../misc_commands/text_before_line_command.pl | 62 +-
tp/t/results/moresectioning/anchor_in_footnote.pl | 112 +-
.../moresectioning/anchor_in_footnote_separate.pl | 112 +-
.../anchor_in_footnote_separate_split_node.pl | 112 +-
.../anchor_in_footnote_split_node.pl | 112 +-
tp/t/results/moresectioning/chapter_sections.pl | 228 +-
.../moresectioning/character_and_spaces_in_refs.pl | 659 +-
.../character_and_spaces_in_refs_out.pl | 659 +-
tp/t/results/moresectioning/complex.pl | 1198 +--
.../moresectioning/complex_split_at_node.pl | 1198 +--
tp/t/results/moresectioning/contents.pl | 319 +-
.../moresectioning/contents_and_shortcontents.pl | 319 +-
.../contents_at_begin_chapter_without_node.pl | 79 +-
.../moresectioning/contents_at_end_document.pl | 83 +-
.../contents_at_end_document_after_node.pl | 156 +-
.../results/moresectioning/contents_in_document.pl | 79 +-
tp/t/results/moresectioning/empty_top_node_up.pl | 81 +-
.../equivalent_nodes_defined_linked.pl | 112 +-
.../results/moresectioning/internal_top_node_up.pl | 81 +-
.../moresectioning/lowered_subsubsection.pl | 384 +-
tp/t/results/moresectioning/loweredheading.pl | 29 +-
.../moresectioning/more_sections_than_nodes.pl | 682 +-
.../more_sections_than_nodes_texi2html.pl | 682 +-
.../moresectioning/nodes_before_after_top_xref.pl | 174 +-
...nodes_no_section_footnote_no_top_node_output.pl | 54 +-
.../non_automatic_internal_top_node_up.pl | 465 +-
.../non_automatic_top_node_up_and_url.pl | 465 +-
.../non_automatic_top_node_up_url.pl | 305 +-
.../moresectioning/only_special_spaces_node.pl | 342 +-
.../moresectioning/placed_things_before_element.pl | 33 +-
.../placed_things_before_element_no_use_node.pl | 33 +-
.../moresectioning/placed_things_before_node.pl | 112 +-
tp/t/results/moresectioning/raiselowersections.pl | 328 +-
tp/t/results/moresectioning/rec_nodes.pl | 349 +-
.../moresectioning/section_in_unnumbered_info.pl | 1786 ++--
.../section_in_unnumbered_plaintext.pl | 1786 ++--
.../moresectioning/sectioning_part_appendix.pl | 313 +-
.../sectioning_part_appendix_no_top.pl | 284 +-
.../sectioning_part_appendix_texi2html_chapter.pl | 315 +-
tp/t/results/moresectioning/sections_test.pl | 315 +-
.../moresectioning/sections_test_no_use_nodes.pl | 315 +-
...ctions_test_no_use_nodes_use_node_directions.pl | 315 +-
tp/t/results/moresectioning/shortcontents.pl | 319 +-
.../moresectioning/special_spaces_in_nodes.pl | 334 +-
.../results/moresectioning/top_chapter_sections.pl | 257 +-
tp/t/results/moresectioning/top_node_up_url.pl | 81 +-
tp/t/results/moresectioning/topic_guide.pl | 567 +-
tp/t/results/plaintext_tests/all_spaces.pl | 50 +-
.../cartouche_and_paragraph_indentation.pl | 162 +-
.../plaintext_tests/chinese_mixed_with_en.pl | 108 +-
tp/t/results/plaintext_tests/japanese_utf8.pl | 166 +-
.../plaintext_tests/line_passed_and_formats.pl | 33 +-
.../plaintext_tests/no_empty_line_after_section.pl | 116 +-
tp/t/results/plaintext_tests/non_break_spaces.pl | 29 +-
.../punctuation_sc_accents_ascii_glyph.pl | 108 +-
.../punctuation_sc_accents_ascii_glyph_latin1.pl | 108 +-
.../punctuation_sc_accents_ascii_glyph_usascii.pl | 108 +-
.../punctuation_sc_accents_default.pl | 108 +-
.../punctuation_sc_accents_default_latin1.pl | 108 +-
.../punctuation_sc_accents_default_usascii.pl | 108 +-
.../punctuation_sc_accents_disable_encoding.pl | 108 +-
...nctuation_sc_accents_disable_encoding_latin1.pl | 108 +-
...ctuation_sc_accents_disable_encoding_usascii.pl | 108 +-
...uation_sc_accents_to_utf8_ascii_glyph_latin1.pl | 108 +-
...ation_sc_accents_to_utf8_ascii_glyph_usascii.pl | 108 +-
.../punctuation_sc_accents_to_utf8_latin1.pl | 108 +-
.../punctuation_sc_accents_to_utf8_usascii.pl | 108 +-
tp/t/results/plaintext_tests/quote_node_names.pl | 631 +-
.../plaintext_tests/settitle_and_empty_top.pl | 23 +-
tp/t/results/raw/inlineraw_not_closed.pl | 25 +-
tp/t/results/regions/anchor_in_copying.pl | 60 +-
.../regions/anchor_in_copying_in_footnote.pl | 60 +-
tp/t/results/regions/anchor_in_titlepage.pl | 110 +-
.../regions/anchor_in_titlepage_titlepage.pl | 110 +-
tp/t/results/regions/format_in_titlepage.pl | 54 +-
.../regions/format_in_titlepage_titlepage.pl | 54 +-
tp/t/results/regions/ref_in_copying.pl | 110 +-
.../regions/ref_in_copying_insert_in_chapter.pl | 164 +-
tp/t/results/regions/today_in_copying.pl | 83 +-
tp/t/results/sectioning/a_comma_after_node.pl | 103 +-
tp/t/results/sectioning/anchor_zero.pl | 31 +-
tp/t/results/sectioning/at_commands_in_node.pl | 223 +-
.../sectioning/automatic_menu_referencing_node.pl | 158 +-
.../sectioning/chapter_before_and_after_part.pl | 87 +-
tp/t/results/sectioning/chapter_before_part.pl | 54 +-
tp/t/results/sectioning/chapter_between_nodes.pl | 181 +-
.../sectioning/chapter_between_nodes_texi2html.pl | 181 +-
.../chapter_between_nodes_with_appendix.pl | 131 +-
.../chapter_between_nodes_with_appendix_nomenu.pl | 131 +-
.../chapter_node_before_and_after_part.pl | 139 +-
.../sectioning/character_and_spaces_in_node.pl | 505 +-
tp/t/results/sectioning/contents_and_parts.pl | 280 +-
tp/t/results/sectioning/contents_in_html_text.pl | 116 +-
.../sectioning/contents_with_only_top_node.pl | 29 +-
.../results/sectioning/double_node_anchor_float.pl | 112 +-
tp/t/results/sectioning/double_part.pl | 166 +-
...double_recursive_self_section_node_reference.pl | 195 +-
...sive_self_section_node_reference_no_use_node.pl | 195 +-
.../double_recursive_self_section_reference.pl | 160 +-
tp/t/results/sectioning/double_top.pl | 158 +-
tp/t/results/sectioning/double_top_in_menu.pl | 162 +-
tp/t/results/sectioning/double_top_section.pl | 58 +-
tp/t/results/sectioning/email_in_node.pl | 161 +-
tp/t/results/sectioning/empty_node.pl | 152 +-
.../sectioning/empty_nodes_with_commands.pl | 106 +-
tp/t/results/sectioning/empty_ref_arg.pl | 37 +-
.../results/sectioning/empty_section_in_chapter.pl | 48 +-
tp/t/results/sectioning/equivalent_labels.pl | 33 +-
tp/t/results/sectioning/equivalent_nodes.pl | 120 +-
.../sectioning/equivalent_nodes_novalidate.pl | 120 +-
.../results/sectioning/explicit_node_directions.pl | 247 +-
tp/t/results/sectioning/external_node_in_menu.pl | 166 +-
tp/t/results/sectioning/hole_in_sectioning.pl | 141 +-
.../in_menu_only_special_ascii_spaces_node.pl | 142 +-
.../in_menu_only_special_ascii_spaces_node_menu.pl | 142 +-
.../sectioning/in_menu_only_special_spaces_node.pl | 350 +-
.../in_menu_only_special_spaces_node_menu.pl | 350 +-
tp/t/results/sectioning/lone_Top_node.pl | 81 +-
tp/t/results/sectioning/loop_nodes.pl | 227 +-
tp/t/results/sectioning/menutextorder.pl | 382 +-
tp/t/results/sectioning/next_in_menu_is_below.pl | 220 +-
tp/t/results/sectioning/next_no_prev_to_node.pl | 215 +-
.../results/sectioning/no_argument_and_contents.pl | 66 +-
tp/t/results/sectioning/no_menu.pl | 206 +-
tp/t/results/sectioning/node_empty_direction.pl | 29 +-
tp/t/results/sectioning/node_line_arguments.pl | 673 +-
tp/t/results/sectioning/node_nested_parentheses.pl | 45 +-
.../sectioning/node_part_chapter_after_chapter.pl | 199 +-
.../sectioning/node_part_chapter_after_top.pl | 129 +-
tp/t/results/sectioning/node_referenced_in_ref.pl | 87 +-
.../node_sectop_before_chapter_no_node.pl | 79 +-
.../sectioning/node_sectop_before_lone_node_Top.pl | 137 +-
tp/t/results/sectioning/node_simple.pl | 13 +-
tp/t/results/sectioning/node_too_much_args.pl | 89 +-
.../node_up_direction_for_top_with_manual.pl | 87 +-
tp/t/results/sectioning/node_up_external_node.pl | 202 +-
tp/t/results/sectioning/nodename_parentheses.pl | 230 +-
...fter_top_before_chapter_no_use_nodes_chapter.pl | 272 +-
.../nodes_after_top_before_chapter_nodes.pl | 272 +-
.../nodes_after_top_before_chapter_not_split.pl | 272 +-
...ore_chapter_not_split_no_use_node_directions.pl | 272 +-
.../nodes_after_top_before_chapter_sections.pl | 272 +-
.../nodes_after_top_before_chapter_texi2html.pl | 272 +-
...p_before_chapter_texi2html_use_nodes_chapter.pl | 272 +-
.../nodes_after_top_before_section_nodes.pl | 272 +-
.../nodes_after_top_before_section_sections.pl | 272 +-
...s_after_top_before_section_texi2html_chapter.pl | 272 +-
...after_top_before_section_texi2html_use_nodes.pl | 272 +-
...p_before_section_texi2html_use_nodes_chapter.pl | 272 +-
tp/t/results/sectioning/nodes_before_after_top.pl | 166 +-
tp/t/results/sectioning/nodes_before_top.pl | 332 +-
.../nodes_no_node_top_explicit_directions.pl | 168 +-
tp/t/results/sectioning/novalidate.pl | 69 +-
.../one_node_explicit_directions_anchor.pl | 75 +-
..._node_explicit_directions_anchor_no_use_node.pl | 75 +-
tp/t/results/sectioning/one_subsection.pl | 25 +-
tp/t/results/sectioning/one_subsection_and_node.pl | 50 +-
tp/t/results/sectioning/part_before_chapter.pl | 46 +-
tp/t/results/sectioning/part_before_section.pl | 48 +-
tp/t/results/sectioning/part_before_top.pl | 46 +-
tp/t/results/sectioning/part_chapter_after_top.pl | 129 +-
tp/t/results/sectioning/part_chapter_appendix.pl | 83 +-
tp/t/results/sectioning/part_node_after_top.pl | 106 +-
tp/t/results/sectioning/part_node_before_top.pl | 184 +-
.../sectioning/part_node_chapter_after_top.pl | 352 +-
.../sectioning/part_node_chapter_appendix.pl | 162 +-
.../sectioning/part_node_chapter_node_appendix.pl | 189 +-
.../sectioning/part_node_node_part_appendix.pl | 210 +-
tp/t/results/sectioning/part_node_part_appendix.pl | 183 +-
.../sectioning/part_node_part_node_appendix.pl | 210 +-
tp/t/results/sectioning/part_section_part.pl | 83 +-
.../sectioning/protected_node_parentheses.pl | 107 +-
.../sectioning/recursive_self_section_reference.pl | 84 +-
tp/t/results/sectioning/ref_to_top.pl | 56 +-
.../reference_to_only_special_spaces_node.pl | 190 +-
.../sectioning/section_before_after_top_node.pl | 112 +-
.../section_before_after_top_node_last_node.pl | 137 +-
tp/t/results/sectioning/section_before_chapter.pl | 54 +-
tp/t/results/sectioning/section_before_part.pl | 58 +-
tp/t/results/sectioning/section_before_top.pl | 152 +-
.../sectioning/section_before_top_no_node.pl | 54 +-
.../results/sectioning/section_below_unnumbered.pl | 166 +-
.../sectioning/section_below_unnumbered_no_top.pl | 50 +-
.../sectioning/section_chapter_before_top.pl | 83 +-
.../sectioning/section_chapter_before_top_nodes.pl | 166 +-
.../results/sectioning/section_node_before_part.pl | 79 +-
tp/t/results/sectioning/sections.pl | 25 +-
tp/t/results/sectioning/semi_auto.pl | 298 +-
.../setfilename_on_top_and_after_node.pl | 84 +-
tp/t/results/sectioning/space_in_node.pl | 120 +-
.../sectioning/split_for_format_not_split.pl | 29 +-
.../sectioning/top_no_argument_and_content.pl | 23 +-
.../results/sectioning/top_no_argument_and_node.pl | 44 +-
.../sectioning/top_no_argument_and_top_node.pl | 44 +-
.../sectioning/top_node_no_menu_direction.pl | 122 +-
tp/t/results/sectioning/top_node_part_top.pl | 75 +-
tp/t/results/sectioning/top_part_chapter.pl | 77 +-
tp/t/results/sectioning/top_without_node_nodes.pl | 127 +-
.../sectioning/top_without_node_sections.pl | 127 +-
.../top_without_node_texi2html_no_use_nodes.pl | 127 +-
.../transliterated_split_equivalent_nodes.pl | 173 +-
tp/t/results/sectioning/two_nodes_at_the_end.pl | 280 +-
.../sectioning/two_nodes_at_the_end_nodes.pl | 280 +-
.../sectioning/two_nodes_at_the_end_texi2html.pl | 280 +-
.../sectioning/two_nodes_between_chapters.pl | 305 +-
.../sectioning/two_nodes_between_chapters_nodes.pl | 305 +-
.../two_nodes_between_chapters_texi2html.pl | 305 +-
.../sectioning/two_unnumbered_no_argument.pl | 38 +-
.../unknown_node_direction_novalidate.pl | 61 +-
tp/t/results/sectioning/unknown_node_in_menu.pl | 31 +-
.../sectioning/unknown_node_in_menu_novalidate.pl | 31 +-
.../sectioning/unnumbered_before_node_top_top.pl | 83 +-
tp/t/results/sectioning/unnumbered_before_top.pl | 54 +-
.../sectioning/unnumbered_before_top_node.pl | 58 +-
tp/t/results/sectioning/unnumbered_no_argument.pl | 19 +-
.../unnumbered_top_without_node_nodes.pl | 225 +-
.../unnumbered_top_without_node_sections.pl | 225 +-
...dex_entries_relate_to_item_no_transformation.pl | 116 +-
.../index_entries_relate_to_item_transformation.pl | 116 +-
.../insert_nodes_for_sectioning_commands.pl | 653 +-
tp/t/results/transformations/master_menu_fr.pl | 187 +-
...generate_master_menu_no_need_for_master_menu.pl | 106 +-
.../regenerate_master_menu_with_menu_comment.pl | 185 +-
tp/t/results/value/value_in_index_commands.pl | 60 +-
tp/t/results/value/value_in_misc_commands.pl | 127 +-
tp/t/results/value/value_in_node.pl | 465 +-
tp/t/results/value/value_node_directions.pl | 658 +-
tp/t/results/xml_tests/commands_and_spaces.pl | 183 +-
tp/t/results/xml_tests/image_inline_or_not.pl | 150 +-
.../xml_tests/sectioning_test_no_use_nodes.pl | 216 +-
tp/t/results/xml_tests/sectioning_test_ref.pl | 216 +-
tp/t/results/xml_tests/top_node_and_bye.pl | 29 +-
tp/t/results/xml_tests/top_node_no_section.pl | 25 +-
tp/t/results/xtable/block_commands_in_table.pl | 120 +-
.../results/xtable/inter_item_commands_in_table.pl | 174 +-
tp/t/results/xtable/item_index_transformation.pl | 80 +-
804 files changed, 83890 insertions(+), 69174 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 95e6144f64..98db6341b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+2024-11-14 Patrice Dumas <pertusus@free.fr>
+
+ root line commands in 'argument' container in contents
+
+ * tp/Texinfo/Common.pm (is_content_empty), tp/Texinfo/XS/main/utils.c
+ (is_content_empty): ignore argument type.
+
+ * tp/Texinfo/XS/convert/format_html.c (html_open_quotation_command):
+ remove incorrect const.
+
+ * tp/Texinfo/Common.pm (get_label_element), tp/Texinfo/XS/main/utils.c
+ (get_label_element), tp/Texinfo/ParserNonXS.pm (_end_line_misc_line)
+ (_check_valid_nesting, _handle_line_command)
+ (_process_remaining_on_line, _parse_line_command_args),
+ tp/Texinfo/Structuring.pm (check_nodes_are_referenced, nodes_tree)
+ (new_node_menu_entry, new_block_command, new_complete_node_menu)
+ (_print_down_menus), tp/Texinfo/Transformations.pm
+ (fill_gaps_in_sectioning, _new_node)
+ (_get_non_automatic_nodes_with_sections),
+ tp/Texinfo/XS/parsetexi/end_line.c (parse_line_command_args)
+ (end_line_misc_line), tp/Texinfo/XS/parsetexi/handle_commands.c
+ (handle_line_command), tp/Texinfo/XS/parsetexi/parser.c
+ (check_valid_nesting, process_remaining_on_line),
+ tp/Texinfo/XS/structuring_transfo/structuring.c (new_block_command)
+ (check_nodes_are_referenced, complete_node_tree_with_menus, nodes_tree)
+ (new_node_menu_entry, new_complete_node_menu, print_down_menus),
+ tp/Texinfo/XS/structuring_transfo/transformations.c
+ (fill_gaps_in_sectioning, new_node)
+ (insert_nodes_for_sectioning_commands)
+ (get_non_automatic_nodes_with_sections): put arguments of root line
+ commands (@node, sectioning commands) in the first content in the
+ argument container type, remove args.
+
+ * tp/Texinfo/Convert/Converter.pm
+ (normalized_sectioning_command_filename, set_output_units_files)
+ (format_comment_or_return_end_line, sort_element_counts),
+ tp/Texinfo/Convert/DocBook.pm (conversion_output_begin)
+ (_convert_argument_and_end_line, _convert), tp/Texinfo/Convert/HTML.pm
+ (_internal_command_tree, _convert_heading_command)
+ (_file_header_information, _prepare_converted_output_info)
+ (_node_redirections), tp/Texinfo/Convert/LaTeX.pm (_convert),
+ tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
+ tp/Texinfo/Convert/Plaintext.pm (process_footnotes, format_contents)
+ (_convert), tp/Texinfo/Convert/Texinfo.pm
+ (root_heading_command_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm
+ (_convert), tp/Texinfo/Convert/Text.pm (_convert),
+ tp/Texinfo/XS/convert/convert_html.c (fulltitle_cmds)
+ (html_prepare_converted_output_info, html_node_redirections),
+ tp/Texinfo/XS/convert/converter.c
+ (normalized_sectioning_command_filename),
+ tp/Texinfo/XS/convert/format_html.c (html_internal_command_tree)
+ (file_header_information, html_convert_heading_command),
+ tp/Texinfo/XS/main/convert_to_texinfo.c
+ (root_heading_command_to_texinfo),
+ tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
+ tp/Texinfo/XS/main/node_name_normalization.c
+ (convert_to_normalized_internal), tp/ext/epub3.pm (epub_finish),
+ tp/init/chm.pm (chm_init): update conversion code for change in root
+ commands tree.
+
2024-11-12 Patrice Dumas <pertusus@free.fr>
use contents for definition lines instead of args
diff --git a/tp/TODO b/tp/TODO
index a1ace1fa2a..b7554b5634 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -936,21 +936,24 @@ Decomposition of the time used for the Texinfo manual
with full XS
SUM: 98
-find tp/Texinfo -type f -regex '\.pm' -list
-find tp/Texinfo -type f -name '*.pm' -execdir perl -wpli -e 's/^#no
autovivification qw\(fetch delete exists store strict\);/no autovivification
qw\(fetch delete exists store strict\);/' '{}' ';'
-find tp/Texinfo -type f -name '*.pm' -execdir perl -wpli -e 's/^no
autovivification qw\(fetch delete exists store strict\);/#no autovivification
qw\(fetch delete exists store strict\);/' '{}' ';'
+find tp/Texinfo tp/ext tp/init -type f -name '*.pm' -print
+find tp/Texinfo tp/ext tp/init -type f -name '*.pm' -execdir perl -wpli -e
's/^#no autovivification qw\(fetch delete exists store strict\);/no
autovivification qw\(fetch delete exists store strict\);/' '{}' ';'
+find tp/Texinfo tp/ext tp/init -type f -name '*.pm' -execdir perl -wpli -e
's/^no autovivification qw\(fetch delete exists store strict\);/#no
autovivification qw\(fetch delete exists store strict\);/' '{}' ';'
patch -p1 < build_perl_info_fix_typo.diff
patch -p1 < avoid_deprecated_dirs_autovivification.diff
patch -p1 < test_sort_init_config_customization.diff
patch -p1 < Parsetexi_check_conf_defined.diff
+patch -p1 < epub_image_empty_check.diff
+patch -p1 < html32_check_itemize_extra.diff
patch -R -p1 < build_perl_info_fix_typo.diff
patch -R -p1 < avoid_deprecated_dirs_autovivification.diff
patch -R -p1 < test_sort_init_config_customization.diff
patch -R -p1 < Parsetexi_check_conf_defined.diff
-
+patch -R -p1 < epub_image_empty_check.diff
+patch -R -p1 < html32_check_itemize_extra.diff
Setting flags
# some features are only enabled at -O2, but sometime -O0 is better
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index b3b42fc03a..1ce806e721 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1395,6 +1395,8 @@ sub is_content_empty($;$)
next;
}
}
+ next if ($content->{'type'}
+ and $content->{'type'} eq 'argument');
if ($content->{'cmdname'}) {
if ($content->{'type'} and $content->{'type'} eq 'index_entry_command') {
if ($do_not_ignore_index_entries) {
@@ -1726,16 +1728,13 @@ sub get_label_element($)
{
my $current = shift;
return undef if (!defined($current->{'cmdname'}));
- if ($current->{'cmdname'} eq 'node'
- and $current->{'args'} and scalar(@{$current->{'args'}})) {
- return $current->{'args'}->[0];
+ if ($current->{'cmdname'} eq 'node') {
+ return $current->{'contents'}->[0]->{'contents'}->[0];
} elsif ($current->{'cmdname'} eq 'anchor'
and $current->{'contents'} and scalar(@{$current->{'contents'}})) {
return $current->{'contents'}->[0];
} elsif ($current->{'cmdname'} eq 'float'
- and $current->{'contents'} and scalar(@{$current->{'contents'}})
- and $current->{'contents'}->[0]->{'contents'}
- and scalar(@{$current->{'contents'}->[0]->{'contents'}}) >= 2) {
+ and scalar(@{$current->{'contents'}->[0]->{'contents'}}) >= 2) {
return $current->{'contents'}->[0]->{'contents'}->[1];
}
return undef;
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 5113e06a76..9180007bfd 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -658,9 +658,15 @@ sub normalized_sectioning_command_filename($$)
$no_unidecode = 1 if (defined($self->get_conf('USE_UNIDECODE'))
and !$self->get_conf('USE_UNIDECODE'));
+ my $label_element;
+ if ($Texinfo::Commands::root_commands{$command->{'cmdname'}}) {
+ $label_element = $command->{'contents'}->[0]->{'contents'}->[0];
+ } else {
+ $label_element = $command->{'args'}->[0];
+ }
my $normalized_name
= Texinfo::Convert::NodeNameNormalization::normalize_transliterate_texinfo(
- {'contents' => $command->{'args'}->[0]->{'contents'}},
+ {'contents' => $label_element->{'contents'}},
$no_unidecode);
my $filename = $self->_id_to_filename($normalized_name);
@@ -939,7 +945,7 @@ sub set_output_units_files($$$$$$)
$node_filename
= $self->node_information_filename(
$root_command->{'extra'}->{'normalized'},
- $root_command->{'args'}->[0]);
+ $root_command->{'contents'}->[0]->{'contents'}->[0]);
}
$node_filename .= $extension;
$self->set_file_path($node_filename,$destination_directory);
@@ -1338,7 +1344,8 @@ sub format_comment_or_return_end_line($$)
if ($element->{'args'}) {
$arguments_list = $element->{'args'};
} elsif ($element->{'contents'} and scalar(@{$element->{'contents'}})
- and $element->{'contents'}->[0]->{'contents'}) {
+ and $element->{'contents'}->[0]->{'type'}
+ and $element->{'contents'}->[0]->{'type'} eq 'argument') {
$arguments_list = $element->{'contents'}->[0]->{'contents'};
}
@@ -1712,12 +1719,12 @@ sub sort_element_counts($$;$$)
my $name;
if ($output_unit->{'unit_command'}) {
my $command = $output_unit->{'unit_command'};
- if ($command->{'args'}
- and $command->{'args'}->[0]->{'contents'}) {
+ my $line_arg = $command->{'contents'}->[0]->{'contents'}->[0];
+ if ($line_arg->{'contents'}) {
# convert contents to avoid outputting end of lines
$name = "\@$command->{'cmdname'} "
.Texinfo::Convert::Texinfo::convert_to_texinfo(
- {'contents' => $command->{'args'}->[0]->{'contents'}});
+ {'contents' => $line_arg->{'contents'}});
}
}
$name = 'UNNAMED output unit' if (!defined($name));
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index a9c7631a3c..2b39d35a95 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -499,9 +499,10 @@ sub conversion_output_begin($;$$)
# if there is a legalnotice, we really want to have a title
# preceding it, so we also use @top
my $command = $global_commands->{'top'};
+ my $line_arg
+ = $global_commands->{'top'}->{'contents'}->[0]->{'contents'}->[0];
$fulltitle_command = $command
- unless (!$command->{'args'}
- or !$command->{'args'}->[0]->{'contents'});
+ if ($line_arg->{'contents'});
}
my $title_info = '';
@@ -700,7 +701,13 @@ sub _convert_argument_and_end_line($$)
my $self = shift;
my $element = shift;
- my $converted = $self->convert_tree($element->{'args'}->[-1]);
+ my $line_arg;
+ if ($element->{'args'}) {
+ $line_arg = $element->{'args'}->[-1];
+ } else {
+ $line_arg = $element->{'contents'}->[0]->{'contents'}->[-1];
+ }
+ my $converted = $self->convert_tree($line_arg);
my $end_line = $self->format_comment_or_return_end_line($element);
return ($converted, $end_line);
}
@@ -1028,13 +1035,12 @@ sub _convert($$;$)
}
push @{$self->{'lang_stack'}}, $language;
$result .= "<$docbook_sectioning_element${section_attribute}>\n";
- if ($opened_element->{'args'}) {
- my ($arg, $end_line)
- = _convert_argument_and_end_line($self, $opened_element);
- $result .= "<title>$arg</title>$end_line";
- chomp ($result);
- $result .= "\n";
- }
+ my ($arg, $end_line)
+ = _convert_argument_and_end_line($self, $opened_element);
+ $result .= "<title>$arg</title>$end_line";
+ chomp ($result);
+ $result .= "\n";
+
# if associated with a sectioning element, the part is opened
# before the sectioning element, such that the part content
# appears after the sectioning command opening, no need for
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index b2c39f7c9a..78ee71d1c8 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1284,43 +1284,47 @@ sub _internal_command_tree($$$)
if ($command->{'cmdname'} eq 'anchor') {
$label_element = $command->{'contents'}->[0];
} else {
- $label_element = $command->{'args'}->[0];
+ $label_element = $command->{'contents'}->[0]->{'contents'}->[0];
}
$tree = {'type' => '_code',
'contents' => [$label_element]};
} elsif ($command->{'cmdname'} and ($command->{'cmdname'} eq 'float')) {
$tree = $self->float_type_number($command);
- } elsif (!$command->{'args'}->[0]
- or !$command->{'args'}->[0]->{'contents'}
- or !scalar(@{$command->{'args'}->[0]->{'contents'}})) {
} else {
- my $section_number;
- $section_number = $command->{'extra'}->{'section_number'}
- if ($command->{'extra'}
- and defined($command->{'extra'}->{'section_number'}));
- if ($section_number
- and ($self->get_conf('NUMBER_SECTIONS')
- or !defined($self->get_conf('NUMBER_SECTIONS')))) {
- my $substituted_strings
- = {'number' => {'text' => $section_number},
- 'section_title'
- => Texinfo::ManipulateTree::copy_treeNonXS($command->{'args'}->[0])};
-
- if ($command->{'cmdname'} eq 'appendix'
- and $command->{'extra'}->{'section_level'} == 1) {
- $tree = $self->cdt('Appendix {number} {section_title}',
- $substituted_strings);
+ my $line_arg;
+ if ($root_commands{$command->{'cmdname'}}) {
+ $line_arg = $command->{'contents'}->[0]->{'contents'}->[0];
+ } else {
+ $line_arg = $command->{'args'}->[0];
+ }
+ if ($line_arg->{'contents'}) {
+ my $section_number;
+ $section_number = $command->{'extra'}->{'section_number'}
+ if ($command->{'extra'}
+ and defined($command->{'extra'}->{'section_number'}));
+ if ($section_number
+ and ($self->get_conf('NUMBER_SECTIONS')
+ or !defined($self->get_conf('NUMBER_SECTIONS')))) {
+ my $substituted_strings
+ = {'number' => {'text' => $section_number},
+ 'section_title'
+ => Texinfo::ManipulateTree::copy_treeNonXS($line_arg)};
+
+ if ($command->{'cmdname'} eq 'appendix'
+ and $command->{'extra'}->{'section_level'} == 1) {
+ $tree = $self->cdt('Appendix {number} {section_title}',
+ $substituted_strings);
+ } else {
+ # TRANSLATORS: numbered section title
+ $tree = $self->cdt('{number} {section_title}',
+ $substituted_strings);
+ }
} else {
- # TRANSLATORS: numbered section title
- $tree = $self->cdt('{number} {section_title}',
- $substituted_strings);
+ $tree = $line_arg;
}
- } else {
- $tree = $command->{'args'}->[0];
}
- $target->{'tree_nonumber'}
- = $command->{'args'}->[0];
+ $target->{'tree_nonumber'} = $line_arg;
}
$target->{'tree'} = $tree;
}
@@ -4586,8 +4590,9 @@ sub _convert_heading_command($$$$$)
if ($element->{'extra'} and $element->{'extra'}->{'associated_node'});
if ($node) {
+ my $argument = $node->{'contents'}->[0];
my $automatic_directions = 1;
- if ($node->{'args'} and scalar(@{$node->{'args'}}) > 1) {
+ if (scalar(@{$argument->{'contents'}}) > 1) {
$automatic_directions = 0;
}
@@ -11127,10 +11132,9 @@ sub _file_header_information($$;$)
my $element_tree;
if ($self->get_conf('SECTION_NAME_IN_TITLE')
and $command->{'extra'}
- and $command->{'extra'}->{'associated_section'}
- and $command->{'extra'}->{'associated_section'}->{'args'}
- and $command->{'extra'}->{'associated_section'}->{'args'}->[0]) {
- $element_tree =
$command->{'extra'}->{'associated_section'}->{'args'}->[0];
+ and $command->{'extra'}->{'associated_section'}){
+ $element_tree = $command->{'extra'}->{'associated_section'}
+ ->{'contents'}->[0]->{'contents'}->[0];
} else {
# this should not happen, as the command_string should be empty already
$element_tree = $self->command_tree($command);
@@ -12613,6 +12617,13 @@ sub _prepare_converted_output_info($$$$)
last;
}
}
+ if (!$fulltitle_tree and $global_commands->{'top'}) {
+ my $argument = $global_commands->{'top'}->{'contents'}->[0];
+ my $line_arg = $argument->{'contents'}->[0];
+ if ($line_arg->{'contents'}) {
+ $fulltitle_tree = $line_arg;
+ }
+ }
if (!$fulltitle_tree and $global_commands->{'titlefont'}
and $global_commands->{'titlefont'}->[0]->{'contents'}
and $global_commands->{'titlefont'}->[0]->{'contents'}->[0]
@@ -12951,12 +12962,14 @@ sub _node_redirections($$$$)
}
} elsif ($file_info_type eq 'node') {
my $conflicting_node = $file_source->{'file_info_element'};
+ my $label_element
+ = Texinfo::Common::get_label_element($conflicting_node);
$self->converter_line_warn(
sprintf(__p('conflict of redirection file with file based on node
name',
"conflict with \@%s `%s' file"),
$conflicting_node->{'cmdname'},
Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
- => $conflicting_node->{'args'}->[0]->{'contents'}}),
+ => $label_element->{'contents'}})
),
$conflicting_node->{'source_info'}, 1);
} elsif ($file_info_type eq 'redirection') {
@@ -12977,7 +12990,8 @@ sub _node_redirections($$$$)
"conflict with \@%s `%s' file"),
$conflicting_section->{'cmdname'},
Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
- => $conflicting_section->{'args'}->[0]->{'contents'}}),
+ => $conflicting_section->{'contents'}->[0]
+ ->{'contents'}->[0]->{'contents'}}),
),
$conflicting_section->{'source_info'}, 1);
} elsif ($file_info_type eq 'special_unit') {
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index c49be67fc3..2669f353a1 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3531,7 +3531,7 @@ sub _convert($$)
if (defined($self->get_conf('xrefautomaticsectiontitle'))
and $self->get_conf('xrefautomaticsectiontitle') eq 'on'
and $section_command) {
- $name = $section_command->{'args'}->[0];
+ $name = $section_command->{'contents'}->[0]->{'contents'}->[0];
} else {
$name = {'contents' => $reference_node_content};
}
@@ -3970,7 +3970,8 @@ sub _convert($$)
if (!$element->{'extra'}
or not $element->{'extra'}->{'associated_section'}) {
my $node_label
- = _tree_anchor_label($element->{'args'}->[0]->{'contents'});
+ = _tree_anchor_label(
+ $element->{'contents'}->[0]->{'contents'}->[0]->{'contents'});
$result .= "\\label{$node_label}%\n";
}
} else {
@@ -3980,7 +3981,13 @@ sub _convert($$)
}
if (not $self->{'formatting_context'}->[-1]->{'in_skipped_node_top'}) {
my $heading = '';
- if ($element->{'args'}->[0]->{'contents'}) {
+ my $line_arg;
+ if ($root_commands{$element->{'cmdname'}}) {
+ $line_arg = $element->{'contents'}->[0]->{'contents'}->[0];
+ } else {
+ $line_arg = $element->{'args'}->[0];
+ }
+ if ($line_arg->{'contents'}) {
# It is useful to know that this is a heading formatting as
# the formatted heading is in the table of content, and some
# formatting may be different for that case, for instance with
@@ -3988,7 +3995,7 @@ sub _convert($$)
$self->{'formatting_context'}->[-1]
->{'in_sectioning_command_heading'} = 1;
$heading = $self->_convert(
- {'contents' => $element->{'args'}->[0]->{'contents'}});
+ {'contents' => $line_arg->{'contents'}});
$self->{'formatting_context'}->[-1]
->{'in_sectioning_command_heading'} = 0;
}
@@ -4010,7 +4017,8 @@ sub _convert($$)
if ($element->{'extra'} and $element->{'extra'}->{'associated_node'}) {
my $associated_node = $element->{'extra'}->{'associated_node'};
my $node_label
- =
_tree_anchor_label($associated_node->{'args'}->[0]->{'contents'});
+ = _tree_anchor_label(
+
$associated_node->{'contents'}->[0]->{'contents'}->[0]->{'contents'});
$result .= "\\label{$node_label}%\n";
}
}
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index f58212b3cb..fe2f397c6f 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -280,7 +280,11 @@ sub _convert($)
or ($element->{'args'} and $element->{'args'}->[0]
and $element->{'args'}->[0]->{'type'}
and ($element->{'args'}->[0]->{'type'} eq 'line_arg'
- or $element->{'args'}->[0]->{'type'} eq
'rawline_arg')))));
+ or $element->{'args'}->[0]->{'type'} eq 'rawline_arg')
+ or ($element->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}
+ and $element->{'contents'}->[0]->{'contents'}->[0]->{'type'}
+ and $element->{'contents'}->[0]->{'contents'}->[0]->{'type'} eq
'line_arg')))));
if ($element->{'cmdname'}) {
my $cmdname = $element->{'cmdname'};
if (defined($normalize_node_nobrace_symbol_text{$cmdname})) {
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 7ec0a8d35d..d1387ec537 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1272,7 +1272,7 @@ sub process_footnotes($;$)
$node_element = $element->{'unit_command'};
if ($node_element->{'extra'}
and defined($node_element->{'extra'}->{'normalized'})) {
- $label_element = $node_element->{'args'}->[0];
+ $label_element = $node_element->{'contents'}->[0]->{'contents'}->[0];
}
}
@@ -1291,7 +1291,8 @@ sub process_footnotes($;$)
'contents' => [$label_element, {'text' => '-Footnotes'}]};
my $footnotes_node = {
'cmdname' => 'node',
- 'args' => [$footnotes_node_arg],
+ 'contents' => [{'type' => 'argument',
+ 'contents' => [$footnotes_node_arg],}],
'extra' => {'is_target' => 1,
'normalized'
=> $node_element->{'extra'}->{'normalized'}.'-Footnotes',
@@ -1528,6 +1529,8 @@ sub format_contents($$$)
my $section = $top_section;
SECTION:
while ($section) {
+ my $argument = $section->{'contents'}->[0];
+ my $line_arg = $argument->{'contents'}->[0];
my $section_title_tree;
if (defined($section->{'extra'}->{'section_number'})
and ($self->get_conf('NUMBER_SECTIONS')
@@ -1537,15 +1540,15 @@ sub format_contents($$$)
$section_title_tree = $self->cdt('Appendix {number} {section_title}',
{'number' => {'text'
=> $section->{'extra'}->{'section_number'}},
- 'section_title' => $section->{'args'}->[0]});
+ 'section_title' => $line_arg});
} else {
$section_title_tree = $self->cdt('{number} {section_title}',
{'number' => {'text'
=> $section->{'extra'}->{'section_number'}},
- 'section_title' => $section->{'args'}->[0]});
+ 'section_title' => $line_arg});
}
} else {
- $section_title_tree = $section->{'args'}->[0];
+ $section_title_tree = $line_arg;
}
my $repeat_count
= 2 * ($section->{'extra'}->{'section_level'} - ($root_level+1));
@@ -3196,7 +3199,7 @@ sub _convert($$)
'contents' => [
{'type' => 'brace_arg',
'contents' => [
- $self->{'current_node'}->{'args'}->[0],
+
$self->{'current_node'}->{'contents'}->[0]->{'contents'}->[0],
{'text' => "-Footnote-$self->{'footnote_index'}"}
]
}
@@ -3528,10 +3531,14 @@ sub _convert($$)
# use settitle for empty @top
# ignore @part
my $heading_element;
- if ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}
- and $cmdname ne 'part') {
- $heading_element = $element->{'args'}->[0];
+ my $line_arg;
+ if ($root_commands{$cmdname}) {
+ $line_arg = $element->{'contents'}->[0]->{'contents'}->[0];
+ } else {
+ $line_arg = $element->{'args'}->[0];
+ }
+ if ($cmdname ne 'part' and $line_arg->{'contents'}) {
+ $heading_element = $line_arg;
} elsif ($cmdname eq 'top') {
my $global_commands;
if ($self->{'document'}) {
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 85b8a0f2df..5518589e33 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -170,15 +170,15 @@ sub root_heading_command_to_texinfo($)
if ($element->{'cmdname'}) {
if (($element->{'cmdname'} eq 'node'
or $sectioning_heading_commands{$element->{'cmdname'}})
- and $element->{'args'}->[0]->{'contents'}) {
- $tree = $element->{'args'}->[0]->{'contents'};
+ and $element->{'contents'}->[0]->{'contents'}->[0]->{'contents'}) {
+ $tree = $element->{'contents'}->[0]->{'contents'}->[0];
}
} else {
return "Not a command";
}
if ($tree) {
return '@'.$element->{'cmdname'}.' '
- .convert_to_texinfo({'contents' => $tree});
+ .convert_to_texinfo({'contents' => $tree->{'contents'}});
} else {
return '@'.$element->{'cmdname'};
}
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 603d1d942e..706ce5cd07 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -913,10 +913,12 @@ sub _convert($$;$)
$result .= $self->txi_markup_open_element('node',
[['name', $nodename],
_leading_spaces_arg($element)]);
push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1;
+ my $argument = $element->{'contents'}->[0];
+ my $line_arg = $argument->{'contents'}->[0];
$result .= $self->txi_markup_open_element('nodename',
-
[_trailing_spaces_arg($element->{'args'}->[0])]);
+ [_trailing_spaces_arg($line_arg)]);
$result .= $self->_convert({'contents'
- => $element->{'args'}->[0]->{'contents'}})
+ => $line_arg->{'contents'}})
if ($nodename ne '');
$result .= $self->txi_markup_close_element('nodename');
# first arg is the node name, directions start at 1.
@@ -930,16 +932,15 @@ sub _convert($$;$)
= $element->{'extra'}->{'node_directions'}->{lc($direction)};
my $node_name = '';
my $attributes = [];
- if ($element->{'args'} and
$element->{'args'}->[$direction_index]) {
+ if ($argument->{'contents'}->[$direction_index]) {
push @$attributes, _leading_trailing_spaces_arg(
- $element->{'args'}->[$direction_index]);
+ $argument->{'contents'}->[$direction_index]);
}
- if (!$element->{'args'}
- or scalar(@{$element->{'args'}}) < $direction_index +1
- or
!defined($element->{'args'}->[$direction_index]->{'extra'})
- or !(defined($element->{'args'}->[$direction_index]
+ if (scalar(@{$argument->{'contents'}}) < $direction_index +1
+ or
!defined($argument->{'contents'}->[$direction_index]->{'extra'})
+ or !(defined($argument->{'contents'}->[$direction_index]
->{'extra'}->{'manual_node'}
- or defined($element->{'args'}->[$direction_index]
+ or defined($argument->{'contents'}->[$direction_index]
->{'extra'}->{'normalized'})))) {
push @$attributes, ['automatic', 'on'];
@@ -952,7 +953,7 @@ sub _convert($$;$)
}
} else {
$node_name
- = $self->_convert($element->{'args'}->[$direction_index]);
+ =
$self->_convert($argument->{'contents'}->[$direction_index]);
}
$result .= "$pending_empty_directions".
$self->txi_markup_open_element($format_element, $attributes)
@@ -960,11 +961,11 @@ sub _convert($$;$)
$self->txi_markup_close_element($format_element);
$pending_empty_directions = '';
} else {
- if ($element->{'args'}->[$direction_index]) {
+ if ($argument->{'contents'}->[$direction_index]) {
$pending_empty_directions .=
$self->txi_markup_open_element($format_element,
[_leading_trailing_spaces_arg(
- $element->{'args'}->[$direction_index])])
+ $argument->{'contents'}->[$direction_index])])
.$self->txi_markup_close_element($format_element);
}
}
@@ -992,16 +993,12 @@ sub _convert($$;$)
$closed_section_element = '';
}
- if ($element->{'args'} and $element->{'args'}->[0]) {
- my ($arg, $end_space, $end_line)
- = $self->_convert_argument_and_end_line($element);
- $result .= $self->txi_markup_open_element('sectiontitle')
- .$arg.$end_space
- .$self->txi_markup_close_element('sectiontitle')
- .$closed_section_element.$end_line;
- } else {
- $result .= $closed_section_element;
- }
+ my ($arg, $end_space, $end_line)
+ = $self->_convert_argument_and_end_line($element);
+ $result .= $self->txi_markup_open_element('sectiontitle')
+ .$arg.$end_space
+ .$self->txi_markup_close_element('sectiontitle')
+ .$closed_section_element.$end_line;
} elsif ($Texinfo::Commands::def_commands{$cmdname}) {
$result .= _convert_def_line($self, $element);
return $result;
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index fd5e54e94b..21029a0fb9 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -712,22 +712,26 @@ sub _convert($$)
chomp ($result);
$result .= "\n" if ($result =~ /\S/);
}
- } elsif ($formatted_line_commands{$data_cmdname}
- and $element->{'args'}) {
+ } elsif ($Texinfo::Commands::sectioning_heading_commands{$cmdname}) {
+ my $line_arg;
+ if ($Texinfo::Commands::root_commands{$cmdname}) {
+ $line_arg = $element->{'contents'}->[0]->{'contents'}->[0];
+ } else {
+ $line_arg = $element->{'args'}->[0];
+ }
+ my $heading_text = _convert($options, $line_arg);
+ $result = _text_heading($element, $heading_text, $options->{'converter'},
+ $options->{'NUMBER_SECTIONS'});
+ } elsif ($formatted_line_commands{$data_cmdname} and $element->{'args'}) {
if ($cmdname ne 'node') {
if ($cmdname eq 'page') {
$result = '';
} else {
$result = _convert($options, $element->{'args'}->[0]);
}
- if ($Texinfo::Commands::sectioning_heading_commands{$cmdname}) {
- $result = _text_heading($element, $result, $options->{'converter'},
- $options->{'NUMBER_SECTIONS'});
- } else {
# we always want an end of line even if is was eaten by a command
- chomp($result);
- $result .= "\n";
- }
+ chomp($result);
+ $result .= "\n";
}
} elsif ($converted_formattable_line_commands{$cmdname}) {
if ($def_commands{$cmdname}) {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 03f8f9b4eb..d0631f296f 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1509,7 +1509,7 @@ sub _close_brace_command($$$;$$$)
# args are always set except in cases of bogus brace @-commands
# without argument, maybe only at the end of a document.
- #die ("$current->{'cmdname'} no args\n") if (!$current->{'args'});
+ #die ("$current->{'cmdname'} no args\n") if (!$current->{'contents'});
if ($self->{'basic_inline_commands'}
and $self->{'basic_inline_commands'}->{$current->{'cmdname'}}) {
@@ -3672,7 +3672,21 @@ sub _end_line_misc_line($$$)
my $document = $self->{'document'};
- my $command = $current->{'parent'}->{'cmdname'};
+ my $command_element;
+ my $line_arg;
+ if ($current->{'parent'}->{'type'}
+ and $current->{'parent'}->{'type'} eq 'argument') {
+ $command_element = $current->{'parent'}->{'parent'};
+ $line_arg = $command_element->{'contents'}->[0]->{'contents'}->[0];
+ } else {
+ $command_element = $current->{'parent'};
+ if ($def_commands{$command_element->{'cmdname'}}) {
+ $line_arg = $command_element->{'contents'}->[0];
+ } else {
+ $line_arg = $command_element->{'args'}->[0];
+ }
+ }
+ my $command = $command_element->{'cmdname'};
my $data_cmdname = $command;
# we are in a command line context, so the @item command information is
@@ -3693,7 +3707,7 @@ sub _end_line_misc_line($$$)
_pop_context($self, ['ct_line'], $source_info, $current, 'in line_arg');
- $current = $current->{'parent'};
+ $current = $command_element;
my $misc_cmd = $current;
my $end_command;
my $included_file;
@@ -3875,8 +3889,9 @@ sub _end_line_misc_line($$$)
$command, $texi_line);
}
} elsif ($command eq 'node') {
- for (my $i = 1; $i < scalar(@{$current->{'args'}}); $i++) {
- my $arg = $current->{'args'}->[$i];
+ my $argument = $current->{'contents'}->[0];
+ for (my $i = 1; $i < scalar(@{$argument->{'contents'}}); $i++) {
+ my $arg = $argument->{'contents'}->[$i];
my $arg_label_manual_info
= Texinfo::Common::parse_node_manual($arg, 1);
if (defined($arg_label_manual_info)) {
@@ -3894,7 +3909,7 @@ sub _end_line_misc_line($$$)
}
}
}
- my $label_element = $current->{'args'}->[0];
+ my $label_element = $argument->{'contents'}->[0];
if (not $label_element or not $label_element->{'contents'}) {
$self->_line_error(
sprintf(__("empty argument in \@%s"),
@@ -3928,7 +3943,7 @@ sub _end_line_misc_line($$$)
}
# Handle all the other 'line' commands. Here just check that they
# have an argument. Empty @top is allowed
- if (!$current->{'args'}->[0]->{'contents'} and $command ne 'top') {
+ if (!$line_arg->{'contents'} and $command ne 'top') {
$self->_command_warn($current,
__("\@%s missing argument"), $command);
} else {
@@ -5068,28 +5083,35 @@ sub _check_valid_nesting {
# error messages for forbidden constructs, like @node in @r,
# block command on line command, @xref in @anchor or node...
if ($current->{'parent'}) {
- if ($current->{'parent'}->{'cmdname'}) {
+ my $parent_command;
+ if ($current->{'parent'}->{'type'}
+ and $current->{'parent'}->{'type'} eq 'argument') {
+ $parent_command = $current->{'parent'}->{'parent'};
+ } else {
+ $parent_command = $current->{'parent'};
+ }
+ if ($parent_command->{'cmdname'}) {
if (defined($self->{'valid_nestings'}
- ->{$current->{'parent'}->{'cmdname'}})
+ ->{$parent_command->{'cmdname'}})
and !$self->{'valid_nestings'}
- ->{$current->{'parent'}->{'cmdname'}}->{$command}
+ ->{$parent_command->{'cmdname'}}->{$command}
# we make sure that we are on a root @-command line and
# not in contents
- and (!$root_commands{$current->{'parent'}->{'cmdname'}}
+ and (!$root_commands{$parent_command->{'cmdname'}}
or ($current->{'type'}
and $current->{'type'} eq 'line_arg'))
# we make sure that we are on a block @-command line and
# not in contents
- and (!defined($block_commands{$current->{'parent'}->{'cmdname'}})
+ and (!defined($block_commands{$parent_command->{'cmdname'}})
or ($current->{'type'}
and $current->{'type'} eq 'block_line_arg'))
# we make sure that we are on an @item/@itemx line and
# not in an @enumerate, @multitable or @itemize @item.
- and (($current->{'parent'}->{'cmdname'} ne 'itemx'
- and $current->{'parent'}->{'cmdname'} ne 'item')
+ and (($parent_command->{'cmdname'} ne 'itemx'
+ and $parent_command->{'cmdname'} ne 'item')
or ($current->{'type'}
and $current->{'type'} eq 'line_arg'))) {
- $invalid_parent = $current->{'parent'}->{'cmdname'};
+ $invalid_parent = $parent_command->{'cmdname'};
}
}
}
@@ -5977,6 +5999,11 @@ sub _handle_line_command($$$$$$)
if ($def_commands{$data_cmdname}) {
$current->{'contents'} = [{ 'type' => 'line_arg',
'parent' => $current }];
+ } elsif ($root_commands{$data_cmdname}) {
+ my $argument = {'type' => 'argument', 'parent' => $current};
+ $current->{'contents'} = [$argument];
+ $argument->{'contents'} = [{ 'type' => 'line_arg',
+ 'parent' => $argument }];
} else {
$current->{'args'} = [{ 'type' => 'line_arg',
'parent' => $current }];
@@ -6038,6 +6065,9 @@ sub _handle_line_command($$$$$$)
if ($def_commands{$data_cmdname}) {
$current = $current->{'contents'}->[-1];
+ } elsif ($root_commands{$data_cmdname}) {
+ $current = $current->{'contents'}->[0]->{'contents'}->[-1];
+ $self->_push_context('ct_line', $command);
} else {
$current = $current->{'args'}->[-1];
$self->_push_context('ct_line', $command);
@@ -7627,8 +7657,15 @@ sub _process_remaining_on_line($$$$)
= _handle_comma($self, $current, $line, $source_info);
} elsif ($current->{'type'}
and $current->{'type'} eq 'line_arg'
- and $current->{'parent'}->{'cmdname'}
- and $current->{'parent'}->{'cmdname'} eq 'node') {
+ # this avoids detecting the comma in @cindex as being on the
+ # node line in the following case:
+ # @node some node
+ #
+ # @cindex a, b
+ and !$current->{'parent'}->{'cmdname'}
+ and $current->{'parent'}->{'parent'}
+ and $current->{'parent'}->{'parent'}->{'cmdname'}
+ and $current->{'parent'}->{'parent'}->{'cmdname'} eq 'node') {
$self->_line_warn(__("superfluous arguments for node"), $source_info);
} else {
$current = _merge_text($self, $current, $comma);
@@ -7966,7 +8003,12 @@ sub _parse_line_command_args($$$)
my $args;
my $command = $line_command->{'cmdname'};
- my $arg = $line_command->{'args'}->[0];
+ my $line_arg;
+ if ($root_commands{$command}) {
+ $line_arg = $line_command->{'contents'}->[0]->{'contents'}->[0];
+ } else {
+ $line_arg = $line_command->{'args'}->[0];
+ }
# Not in XS parser. Could be added if deemded interesting, but
# arguments are already checked below.
@@ -7982,20 +8024,20 @@ sub _parse_line_command_args($$$)
# }
#}
- if (!$arg->{'contents'}) {
+ if (!$line_arg->{'contents'}) {
$self->_command_error($line_command,
__("\@%s missing argument"), $command);
return undef;
}
- if (scalar(@{$arg->{'contents'}}) > 1
- or (!defined($arg->{'contents'}->[0]->{'text'}))) {
+ if (scalar(@{$line_arg->{'contents'}}) > 1
+ or (!defined($line_arg->{'contents'}->[0]->{'text'}))) {
$self->_line_error(sprintf(__("superfluous argument to \@%s"),
$command), $source_info);
}
- return undef if (!defined($arg->{'contents'}->[0]->{'text'}));
+ return undef if (!defined($line_arg->{'contents'}->[0]->{'text'}));
- my $line = $arg->{'contents'}->[0]->{'text'};
+ my $line = $line_arg->{'contents'}->[0]->{'text'};
if ($command eq 'alias') {
# REMACRO
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index feef206072..07c2f7562c 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -528,8 +528,9 @@ sub check_nodes_are_referenced($)
# the nodes appearing in the automatic menu are referenced.
# Note that the menu may not be actually setup, but
# it is better not to warn for nothing.
+ my $argument = $node->{'contents'}->[0];
my $automatic_directions
- = (not ($node->{'args'} and scalar(@{$node->{'args'}}) > 1));
+ = (not (scalar(@{$argument->{'contents'}}) > 1));
if ($automatic_directions) {
my @node_childs = get_node_node_childs_from_sectioning($node);
foreach my $node_child (@node_childs) {
@@ -722,8 +723,9 @@ sub complete_node_tree_with_menus($)
my %cached_menu_nodes;
# Go through all the nodes
foreach my $node (@{$nodes_list}) {
+ my $argument = $node->{'contents'}->[0];
my $automatic_directions
- = (not ($node->{'args'} and scalar(@{$node->{'args'}}) > 1));
+ = (not (scalar(@{$argument->{'contents'}}) > 1));
my $normalized = $node->{'extra'}->{'normalized'};
my $menu_directions = $node->{'extra'}->{'menu_directions'};
@@ -936,8 +938,9 @@ sub nodes_tree($)
}
push @nodes_list, $node;
+ my $argument = $node->{'contents'}->[0];
my $automatic_directions
- = (not ($node->{'args'} and scalar(@{$node->{'args'}}) > 1));
+ = (not (scalar(@{$argument->{'contents'}}) > 1));
if ($automatic_directions) {
if (!$top_node or $node ne $top_node) {
@@ -992,8 +995,8 @@ sub nodes_tree($)
}
}
} else { # explicit directions
- for (my $i = 1; $i < scalar(@{$node->{'args'}}); $i++) {
- my $direction_element = $node->{'args'}->[$i];
+ for (my $i = 1; $i < scalar(@{$argument->{'contents'}}); $i++) {
+ my $direction_element = $argument->{'contents'}->[$i];
my $direction = $node_directions_names[$i-1];
# external node
@@ -1187,7 +1190,7 @@ sub new_node_menu_entry
my $node_name_element;
if ($node->{'extra'} and $node->{'extra'}->{'is_target'}) {
- $node_name_element = $node->{'args'}->[0];
+ $node_name_element = $node->{'contents'}->[0]->{'contents'}->[0];
}
# can happen with node without argument or with empty argument
@@ -1198,7 +1201,8 @@ sub new_node_menu_entry
my $name_element;
if (defined $node->{'extra'}->{'associated_section'}) {
$name_element
- = $node->{'extra'}->{'associated_section'}->{'args'}->[0];
+ = $node->{'extra'}->{'associated_section'}
+ ->{'contents'}->[0]->{'contents'}->[0];
} else {
$name_element = $node_name_element; # shouldn't happen
}
@@ -1282,9 +1286,11 @@ sub new_block_command($$)
$element->{'cmdname'} = $command_name;
- $element->{'args'} = [{'type' => 'block_line_arg', 'parent' => $element,
+ my $argument = {'type' => 'argument', 'parent' => $element};
+ $argument->{'contents'} = [{'type' => 'block_line_arg', 'parent' =>
$argument,
'info' => { 'spaces_after_argument' =>
{'text' => "\n",}}}];
+ unshift @{$element->{'contents'}}, $argument;
my $end = {'cmdname' => 'end', 'parent' => $element,
'extra' => {'text_arg' => $command_name}};
@@ -1375,11 +1381,11 @@ sub new_complete_node_menu
if ($child_section) {
my $part_added = 0;
my $associated_part = $child_section->{'extra'}->{'associated_part'};
- if ($associated_part and $associated_part->{'args'}
- and scalar(@{$associated_part->{'args'}}) > 0) {
+ if ($associated_part) {
+ my $part_line_arg
+ = $associated_part->{'contents'}->[0]->{'contents'}->[0];
my $part_title_copy
- = Texinfo::ManipulateTree::copy_contentsNonXS(
- $associated_part->{'args'}->[0]);
+ = Texinfo::ManipulateTree::copy_contentsNonXS($part_line_arg);
my $part_title
= Texinfo::Translations::gdt('Part: {part_title}',
$customization_information->get_conf('documentlanguage'),
@@ -1556,9 +1562,10 @@ sub _print_down_menus($$$$$;$)
my $node_name_element;
if ($node->{'extra'}->{'associated_section'}) {
my $associated_section = $node->{'extra'}->{'associated_section'};
- $node_name_element = $associated_section->{'args'}->[0];
+ $node_name_element
+ = $associated_section->{'contents'}->[0]->{'contents'}->[0];
} else {
- $node_name_element = $node->{'args'}->[0];
+ $node_name_element = $node->{'contents'}->[0]->{'contents'}->[0];
}
my $node_title_copy
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index fbbdbf44bb..596f75e0dc 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -172,10 +172,13 @@ sub fill_gaps_in_sectioning($;$)
};
$new_section->{'info'} = {'spaces_before_argument' =>
{'text' => ' ',}};
- my $line_arg = {'type' => 'line_arg', 'parent' => $new_section,
+ my $argument = {'type' => 'argument', 'parent' => $new_section};
+
+ my $line_arg = {'type' => 'line_arg', 'parent' => $argument,
'info' => {'spaces_after_argument'
=> {'text' => "\n",}}};
- $new_section->{'args'} = [$line_arg];
+ $argument->{'contents'} = [$line_arg];
+
my $line_content;
if ($commands_heading_content) {
$line_content
@@ -190,7 +193,8 @@ sub fill_gaps_in_sectioning($;$)
$line_content = $asis_command;
}
$line_arg->{'contents'} = [$line_content];
- $new_section->{'contents'} = [{'type' => 'empty_line',
+ $new_section->{'contents'} = [$argument,
+ {'type' => 'empty_line',
'text' => "\n",
'parent' => $new_section}];
push @new_sections, $new_section;
@@ -372,8 +376,12 @@ sub _new_node($$;$)
$node = {'cmdname' => 'node', 'extra' => {}};
$node->{'info'} = {'spaces_before_argument' => {'text' => ' '}};
- my $node_line_arg = {'type' => 'line_arg', 'parent' => $node};
- $node->{'args'} = [$node_line_arg];
+
+ my $argument = {'type' => 'argument', 'parent' => $node};
+ $node->{'contents'} = [$argument];
+
+ my $node_line_arg = {'type' => 'line_arg', 'parent' => $argument};
+ $argument->{'contents'} = [$node_line_arg];
$node_line_arg->{'info'} = {'spaces_after_argument' =>
{'text' => $spaces_after_argument}};
$node_line_arg->{'info'}->{'comment_at_end'} = $comment_at_end
@@ -471,8 +479,9 @@ sub insert_nodes_for_sectioning_commands($)
if ($content->{'cmdname'} eq 'top') {
$new_node_tree = {'contents' => [{'text' => 'Top'}]};
} else {
+ my $line_arg = $content->{'contents'}->[0]->{'contents'}->[0];
$new_node_tree
- =
Texinfo::ManipulateTree::copy_contentsNonXS($content->{'args'}->[0]);
+ = Texinfo::ManipulateTree::copy_contentsNonXS($line_arg);
}
my $new_node = _new_node($new_node_tree, $document,
$customization_information);
@@ -602,7 +611,7 @@ sub _get_non_automatic_nodes_with_sections($)
my @non_automatic_nodes;
foreach my $content (@{$root->{'contents'}}) {
if ($content->{'cmdname'} and $content->{'cmdname'} eq 'node'
- and not ($content->{'args'} and scalar(@{$content->{'args'}}) > 1)
+ and not (scalar(@{$content->{'contents'}->[0]->{'contents'}}) > 1)
and $content->{'extra'}
and $content->{'extra'}->{'associated_section'}) {
push @non_automatic_nodes, $content;
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index 7298d6f0f0..f0eb74da99 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -843,7 +843,7 @@ html_prepare_title_titlepage (CONVERTER *self, const char
*output_file,
}
static const enum command_id fulltitle_cmds[] =
- {CM_settitle, CM_title, CM_shorttitlepage, CM_top, 0};
+ {CM_settitle, CM_title, CM_shorttitlepage, 0};
int
@@ -902,6 +902,17 @@ html_prepare_converted_output_info (CONVERTER *self, const
char *output_file,
}
}
+ if (!fulltitle_tree
+ && self->document->global_commands.top)
+ {
+ const ELEMENT *argument
+ = self->document->global_commands.top->e.c->contents.list[0];
+ ELEMENT *line_arg = argument->e.c->contents.list[0];
+
+ if (line_arg->e.c->contents.number > 0)
+ fulltitle_tree = line_arg;
+ }
+
if (!fulltitle_tree
&& self->document->global_commands.titlefont.number > 0
&& self->document->global_commands.titlefont.list[0]
@@ -2855,9 +2866,11 @@ html_node_redirections (CONVERTER *self,
{
const ELEMENT *conflicting_section
= file_source_info->element;
+ const ELEMENT *line_arg
+ = conflicting_section->e.c->contents.list[0]
+ ->e.c->contents.list[0];
char *section_texi
- = convert_contents_to_texinfo
- (conflicting_section->e.c->args.list[0]);
+ = convert_contents_to_texinfo (line_arg);
pmessage_list_command_warn (&self->error_messages,
self->conf, conflicting_section, 1,
"conflict of redirection file with file based on section name",
diff --git a/tp/Texinfo/XS/convert/converter.c
b/tp/Texinfo/XS/convert/converter.c
index 03fb642cac..512635788e 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -1062,9 +1062,18 @@ normalized_sectioning_command_filename (CONVERTER *self,
const ELEMENT *command)
= (TARGET_FILENAME *) malloc (sizeof (TARGET_FILENAME));
TEXT filename;
char *normalized_file_name;
- char *normalized_name
- = normalize_transliterate_texinfo_contents (command->e.c->args.list[0],
+ char *normalized_name;
+ const ELEMENT *label_element;
+
+ if (builtin_command_data[command->e.c->cmd].flags & CF_root)
+ label_element = command->e.c->contents.list[0]->e.c->contents.list[0];
+ else
+ label_element = command->e.c->args.list[0];
+
+ normalized_name
+ = normalize_transliterate_texinfo_contents (label_element,
(self->conf->TEST.o.integer > 0));
+
normalized_file_name = strdup (normalized_name);
id_to_filename (self, &normalized_file_name);
diff --git a/tp/Texinfo/XS/convert/format_html.c
b/tp/Texinfo/XS/convert/format_html.c
index c789af40cc..17f71338a9 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -1790,7 +1790,8 @@ html_internal_command_tree (CONVERTER *self, const
ELEMENT *command,
if (command->e.c->cmd == CM_anchor)
label_element = command->e.c->contents.list[0];
else
- label_element = command->e.c->args.list[0];
+ label_element
+ = command->e.c->contents.list[0]->e.c->contents.list[0];
add_to_contents_as_array (root_code, label_element);
tree->tree = root_code;
add_tree_to_build (self, tree->tree);
@@ -1801,59 +1802,67 @@ html_internal_command_tree (CONVERTER *self, const
ELEMENT *command,
tree->status = tree_added_status_new_tree;
add_tree_to_build (self, tree->tree);
}
- else if (command->e.c->args.number <= 0
- || command->e.c->args.list[0]->e.c->contents.number <= 0)
- { /* no argument, nothing to do */
- tree->status = tree_added_status_no_tree;
- }
else
{
- const char *section_number
- = lookup_extra_string (command, AI_key_section_number);
- if (section_number && self->conf->NUMBER_SECTIONS.o.integer != 0)
+ ELEMENT *line_arg;
+
+ if (builtin_command_data[command->e.c->cmd].flags & CF_root)
+ line_arg
+ = command->e.c->contents.list[0]->e.c->contents.list[0];
+ else
+ line_arg = command->e.c->args.list[0];
+
+ if (line_arg->e.c->contents.number > 0)
{
- NAMED_STRING_ELEMENT_LIST *replaced_substrings
- = new_named_string_element_list ();
- ELEMENT *e_number = new_text_element (ET_normal_text);
- ELEMENT *section_title_copy
- = copy_tree (command->e.c->args.list[0]);
-
- add_element_to_named_string_element_list (
- replaced_substrings, "section_title",
- section_title_copy);
- text_append (e_number->e.text, section_number);
- add_element_to_named_string_element_list (
- replaced_substrings, "number", e_number);
-
- if (command->e.c->cmd == CM_appendix)
+ const char *section_number;
+ section_number
+ = lookup_extra_string (command, AI_key_section_number);
+
+ if (section_number
+ && self->conf->NUMBER_SECTIONS.o.integer != 0)
{
- int status;
- int section_level = lookup_extra_integer (command,
- AI_key_section_level, &status);
- if (section_level == 1)
+ NAMED_STRING_ELEMENT_LIST *replaced_substrings
+ = new_named_string_element_list ();
+ ELEMENT *e_number = new_text_element (ET_normal_text);
+ ELEMENT *section_title_copy = copy_tree (line_arg);
+
+ add_element_to_named_string_element_list (
+ replaced_substrings, "section_title",
+ section_title_copy);
+ text_append (e_number->e.text, section_number);
+ add_element_to_named_string_element_list (
+ replaced_substrings, "number", e_number);
+
+ if (command->e.c->cmd == CM_appendix)
{
- tree->tree
- = html_cdt_tree (
+ int status;
+ int section_level = lookup_extra_integer (command,
+ AI_key_section_level, &status);
+ if (section_level == 1)
+ {
+ tree->tree
+ = html_cdt_tree (
"Appendix {number} {section_title}",
self, replaced_substrings, 0);
+ }
}
+ if (!tree->tree)
+ /* TRANSLATORS: numbered section title */
+ tree->tree = html_cdt_tree ("{number} {section_title}",
+ self, replaced_substrings, 0);
+
+ destroy_named_string_element_list (replaced_substrings);
+ tree->status = tree_added_status_new_tree;
+ add_tree_to_build (self, tree->tree);
+ }
+ else
+ {
+ tree->status = tree_added_status_reused_tree;
+ tree->tree = line_arg;
}
- if (!tree->tree)
- /* TRANSLATORS: numbered section title */
- tree->tree = html_cdt_tree ("{number} {section_title}",
- self, replaced_substrings, 0);
-
- destroy_named_string_element_list (replaced_substrings);
- tree->status = tree_added_status_new_tree;
- add_tree_to_build (self, tree->tree);
- }
- else
- {
- tree->status = tree_added_status_reused_tree;
- tree->tree = command->e.c->args.list[0];
}
- target_info->tree_nonumber.tree = command->e.c->args.list[0];
+ target_info->tree_nonumber.tree = line_arg;
target_info->tree_nonumber.status =
tree_added_status_reused_tree;
}
}
@@ -3696,9 +3705,10 @@ file_header_information (CONVERTER *self, const ELEMENT
*command,
{
const ELEMENT *associated_section
= lookup_extra_element (command, AI_key_associated_section);
- if (associated_section && associated_section->e.c->args.number >
0)
+ if (associated_section)
{
- command_tree = associated_section->e.c->args.list[0];
+ command_tree = associated_section->e.c->contents.list[0]
+ ->e.c->contents.list[0];
}
}
@@ -7162,7 +7172,8 @@ html_convert_heading_command (CONVERTER *self, const enum
command_id cmd,
= lookup_extra_element (element, AI_key_associated_node);
if (node)
{
- int automatic_directions = (node->e.c->args.number <= 1);
+ const ELEMENT *argument = node->e.c->contents.list[0];
+ int automatic_directions = (argument->e.c->contents.number <= 1);
const CONST_ELEMENT_LIST *menus = lookup_extra_contents (node,
AI_key_menus);
if (!menus && automatic_directions)
@@ -10870,7 +10881,7 @@ html_open_quotation_command (CONVERTER *self, const
enum command_id cmd,
const char *cmdname = element_command_name (element);
char *formatted_quotation_arg_to_prepend = 0;
const ELEMENT *argument = element->e.c->contents.list[0];
- const ELEMENT *block_line_args = argument->e.c->contents.list[0];
+ ELEMENT *block_line_args = argument->e.c->contents.list[0];
if (block_line_args->e.c->contents.number > 0)
{
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 61df92efa9..e1efd3bf19 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -373,9 +373,9 @@ root_heading_command_to_texinfo (const ELEMENT *element)
{
if ((data_cmd == CM_node
|| (builtin_command_data[data_cmd].flags & CF_sectioning_heading))
- && element->e.c->args.number > 0
- && element->e.c->args.list[0]->e.c->contents.number > 0)
- tree = element->e.c->args.list[0];
+ && element->e.c->contents.list[0]->e.c->contents.list[0]
+ ->e.c->contents.number > 0)
+ tree = element->e.c->contents.list[0]->e.c->contents.list[0];
}
else
return strdup ("Not a command");
diff --git a/tp/Texinfo/XS/main/convert_to_text.c
b/tp/Texinfo/XS/main/convert_to_text.c
index a5a6590c8d..152fce9a57 100644
--- a/tp/Texinfo/XS/main/convert_to_text.c
+++ b/tp/Texinfo/XS/main/convert_to_text.c
@@ -950,6 +950,29 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
}
}
}
+ else if (builtin_command_data[data_cmd].flags & CF_sectioning_heading)
+ {
+ const ELEMENT *line_arg;
+ TEXT text;
+ char *heading;
+
+ text_init (&text);
+ text_append (&text, "");
+
+ if (builtin_command_data[data_cmd].flags & CF_root)
+ line_arg = element->e.c->contents.list[0]->e.c->contents.list[0];
+ else
+ line_arg = element->e.c->args.list[0];
+
+ convert_to_text_internal (line_arg, text_options, &text);
+ heading
+ = text_heading (element, text.text,
+ text_options->other_converter_options,
+ text_options->NUMBER_SECTIONS, 0);
+ ADD(heading);
+ free (heading);
+ free (text.text);
+ }
else if (builtin_command_data[data_cmd].other_flags & CF_formatted_line)
{
if (data_cmd != CM_node)
@@ -960,21 +983,9 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
if (data_cmd != CM_page)
convert_to_text_internal (element->e.c->args.list[0],
text_options, &text);
- if (builtin_command_data[data_cmd].flags & CF_sectioning_heading)
- {
- char *heading
- = text_heading (element, text.text,
- text_options->other_converter_options,
- text_options->NUMBER_SECTIONS, 0);
- ADD(heading);
- free (heading);
- }
- else
- {
- if (!(text.end > 0 && text.text[text.end - 1] == '\n'))
- text_append (&text, "\n");
- ADD(text.text);
- }
+ if (!(text.end > 0 && text.text[text.end - 1] == '\n'))
+ text_append (&text, "\n");
+ ADD(text.text);
free (text.text);
}
}
diff --git a/tp/Texinfo/XS/main/node_name_normalization.c
b/tp/Texinfo/XS/main/node_name_normalization.c
index 6d10511962..ede8515429 100644
--- a/tp/Texinfo/XS/main/node_name_normalization.c
+++ b/tp/Texinfo/XS/main/node_name_normalization.c
@@ -77,7 +77,11 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT
*result)
/* here ignore the line commands */
|| (e->e.c->args.number > 0
&& (e->e.c->args.list[0]->type == ET_line_arg
- || e->e.c->args.list[0]->type == ET_rawline_arg)))))
+ || e->e.c->args.list[0]->type == ET_rawline_arg))
+ || (e->e.c->contents.number > 0
+ && e->e.c->contents.list[0]->e.c->contents.number > 0
+ && e->e.c->contents.list[0]->e.c->contents.list[0]->type
+ == ET_line_arg))))
return;
if (e->e.c->cmd)
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index e37ef7e587..234f4e7fa6 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -654,12 +654,12 @@ item_line_parent (ELEMENT *current)
ELEMENT *
get_label_element (const ELEMENT *e)
{
- if (e->e.c->cmd == CM_node && e->e.c->args.number > 0)
- return e->e.c->args.list[0];
+ if (e->e.c->cmd == CM_node)
+ return e->e.c->contents.list[0]->e.c->contents.list[0];
else if (e->e.c->cmd == CM_anchor && e->e.c->contents.number > 0)
return e->e.c->contents.list[0];
- else if (e->e.c->cmd == CM_float && e->e.c->contents.number
- && e->e.c->contents.list[0]->e.c->contents.number >= 2 )
+ else if (e->e.c->cmd == CM_float
+ && e->e.c->contents.list[0]->e.c->contents.number >= 2)
return e->e.c->contents.list[0]->e.c->contents.list[1];
return 0;
}
@@ -1614,6 +1614,9 @@ is_content_empty (const ELEMENT *tree, int
do_not_ignore_index_entries)
}
}
+ if (content->type == ET_argument)
+ continue;
+
data_cmd = element_builtin_data_cmd (content);
if (data_cmd)
{
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index ba423f337e..50c2c78901 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -111,30 +111,36 @@ parse_line_command_args (ELEMENT *line_command)
add_string (string, line_args); \
} while (0)
- ELEMENT *arg = line_command->e.c->args.list[0];
+ ELEMENT *line_arg;
STRING_LIST *line_args;
enum command_id cmd;
const char *line;
cmd = line_command->e.c->cmd;
- if (arg->e.c->contents.number == 0)
+
+ if (command_data(cmd).flags & CF_root)
+ line_arg = line_command->e.c->contents.list[0]->e.c->contents.list[0];
+ else
+ line_arg = line_command->e.c->args.list[0];
+
+ if (line_arg->e.c->contents.number == 0)
{
command_error (line_command, "@%s missing argument", command_name(cmd));
return 0;
}
- if (arg->e.c->contents.number > 1
- || arg->e.c->contents.list[0]->type != ET_normal_text)
+ if (line_arg->e.c->contents.number > 1
+ || line_arg->e.c->contents.list[0]->type != ET_normal_text)
{
line_error ("superfluous argument to @%s", command_name (cmd));
}
- if (arg->e.c->contents.list[0]->type != ET_normal_text
- || arg->e.c->contents.list[0]->e.text->end == 0)
+ if (line_arg->e.c->contents.list[0]->type != ET_normal_text
+ || line_arg->e.c->contents.list[0]->e.text->end == 0)
return 0;
/* put in extra "misc_args" */
line_args = new_string_list ();
- line = arg->e.c->contents.list[0]->e.text->text;
+ line = line_arg->e.c->contents.list[0]->e.text->text;
switch (cmd)
{
@@ -1233,13 +1239,38 @@ end_line_misc_line (ELEMENT *current)
enum command_id end_id = CM_NONE;
int included_file = 0;
SOURCE_MARK *include_source_mark = 0;
+ ELEMENT *command_element;
+ ELEMENT *line_arg = 0;
+
+ if (current->parent->type == ET_argument)
+ {
+ command_element = current->parent->parent;
+ line_arg = command_element->e.c->contents.list[0]->e.c->contents.list[0];
+ }
+ else
+ {
+ command_element = current->parent;
+ if (command_data(command_element->e.c->cmd).flags & CF_def)
+ line_arg = command_element->e.c->contents.list[0];
+ else
+ line_arg = command_element->e.c->args.list[0];
+ }
+
+ data_cmd = cmd = command_element->e.c->cmd;
- data_cmd = cmd = current->parent->e.c->cmd;
/* we are in a command line context, so the @item command information is
associated to CM_item_LINE */
if (cmd == CM_item)
data_cmd = CM_item_LINE;
+ if (! line_arg)
+ {
+ if (command_data(data_cmd).flags & CF_def)
+ line_arg = command_element->e.c->contents.list[0];
+ else
+ line_arg = command_element->e.c->args.list[0];
+ }
+
if (command_data(data_cmd).flags & CF_contain_basic_inline)
(void) pop_command (&nesting_context.basic_inline_stack_on_line);
isolate_last_space (current);
@@ -1247,7 +1278,7 @@ end_line_misc_line (ELEMENT *current)
if (current->parent->flags & EF_def_line)
return end_line_def_line (current);
- current = current->parent;
+ current = command_element;
misc_cmd = current;
arg_spec = command_data(data_cmd).data;
@@ -1576,11 +1607,12 @@ end_line_misc_line (ELEMENT *current)
else if (current->e.c->cmd == CM_node)
{
size_t i;
+ ELEMENT *argument = current->e.c->contents.list[0];
ELEMENT *label_element;
- for (i = 1; i < current->e.c->args.number && i < 4; i++)
+ for (i = 1; i < argument->e.c->contents.number && i < 4; i++)
{
- ELEMENT * arg = current->e.c->args.list[i];
+ ELEMENT * arg = argument->e.c->contents.list[i];
NODE_SPEC_EXTRA *direction_label_info = parse_node_manual (arg, 1);
if (direction_label_info->node_content)
{
@@ -1604,7 +1636,7 @@ end_line_misc_line (ELEMENT *current)
}
/* Now take care of the node itself */
- label_element = current->e.c->args.list[0];
+ label_element = argument->e.c->contents.list[0];
if (label_element->e.c->contents.number == 0)
{
line_error_ext (MSG_error, 0, ¤t->e.c->source_info,
@@ -1639,7 +1671,7 @@ end_line_misc_line (ELEMENT *current)
}
/* All the other "line" commands. Check they have an argument. Empty
@top is allowed. */
- if (current->e.c->args.list[0]->e.c->contents.number == 0
+ if (line_arg->e.c->contents.number == 0
&& current->e.c->cmd != CM_top)
{
command_warn (current, "@%s missing argument",
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 376e12a286..812251caaf 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -927,6 +927,12 @@ handle_line_command (ELEMENT *current, const char
**line_inout,
arg = new_element (ET_line_arg);
if (command_data(data_cmd).flags & CF_def)
add_to_element_contents (current, arg);
+ else if (command_data(data_cmd).flags & CF_root)
+ {
+ ELEMENT *argument = new_element (ET_argument);
+ add_to_element_contents (current, argument);
+ add_to_element_contents (argument, arg);
+ }
else
add_to_element_args (current, arg);
@@ -979,6 +985,11 @@ handle_line_command (ELEMENT *current, const char
**line_inout,
if (command_data(data_cmd).flags & CF_def)
current = last_contents_child (current);
+ else if (command_data(data_cmd).flags & CF_root)
+ {
+ current = last_contents_child (current->e.c->contents.list[0]);
+ push_context (ct_line, cmd);
+ }
else
{
current = last_args_child (current);
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index c19b083a5a..b9165fe529 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1234,6 +1234,7 @@ void
check_valid_nesting (ELEMENT *current, enum command_id cmd)
{
enum command_id invalid_parent = 0;
+ const ELEMENT *parent_command;
/* Check whether outer command can contain cmd. Commands are
classified according to what commands they can contain:
@@ -1245,9 +1246,17 @@ check_valid_nesting (ELEMENT *current, enum command_id
cmd)
int ok = 0; /* Whether nesting is allowed. */
- enum command_id outer = current->parent->e.c->cmd;
- unsigned long outer_flags = command_data(outer).flags;
unsigned long cmd_flags = command_data(cmd).flags;
+ enum command_id outer;
+ unsigned long outer_flags;
+
+ if (current->parent->type == ET_argument)
+ parent_command = current->parent->parent;
+ else
+ parent_command = current->parent;
+
+ outer = parent_command->e.c->cmd;
+ outer_flags = command_data(outer).flags;
/* first three conditions check if in the main contents of the commands
or in the arguments where there is checking of nesting */
@@ -1335,7 +1344,7 @@ check_valid_nesting (ELEMENT *current, enum command_id
cmd)
if (!ok)
{
- invalid_parent = current->parent->e.c->cmd;
+ invalid_parent = parent_command->e.c->cmd;
if (!invalid_parent)
{
/* current_context () == ct_def. Find def block containing
@@ -2523,7 +2532,15 @@ process_remaining_on_line (ELEMENT **current_inout,
const char **line_inout)
&count_remaining_args, current->parent->parent) > 0))
current = handle_comma (current, &line);
else if (current->type == ET_line_arg
- && current->parent->e.c->cmd == CM_node)
+ /* this avoids detecting the comma in @cindex as being on the
+ node line in the following case:
+ @node some node
+
+ @cindex a, b
+ */
+ && !current->parent->e.c->cmd
+ && current->parent->parent
+ && current->parent->parent->e.c->cmd == CM_node)
line_warn ("superfluous arguments for node");
else
current = merge_text (current, ",", 1, 0);
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.c
b/tp/Texinfo/XS/structuring_transfo/structuring.c
index a459f2a0b6..21f9341af4 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.c
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.c
@@ -53,6 +53,7 @@ void
new_block_command (ELEMENT *element)
{
ELEMENT *args = new_element (ET_block_line_arg);
+ ELEMENT *argument = new_element (ET_argument);
ELEMENT *arg_spaces_after = new_text_element (ET_other_text);
ELEMENT *end = new_command_element (ET_line_command, CM_end);
ELEMENT *end_args = new_element (ET_line_arg);
@@ -63,7 +64,9 @@ new_block_command (ELEMENT *element)
text_append (arg_spaces_after->e.text, "\n");
args->elt_info[eit_spaces_after_argument] = arg_spaces_after;
- add_to_element_args (element, args);
+ add_to_element_contents (argument, args);
+
+ insert_into_contents (element, argument, 0);
add_extra_string_dup (end, AI_key_text_arg, command_name);
text_append (end_spaces_before->e.text, " ");
@@ -672,7 +675,8 @@ check_nodes_are_referenced (DOCUMENT *document)
the nodes appearing in the automatic menu are referenced.
Note that the menu may not be actually setup, but
it is better not to warn for nothing. */
- int automatic_directions = (node->e.c->args.number <= 1);
+ const ELEMENT *argument = node->e.c->contents.list[0];
+ int automatic_directions = (argument->e.c->contents.number <= 1);
if (automatic_directions)
{
CONST_ELEMENT_LIST *node_childs
@@ -1040,7 +1044,8 @@ complete_node_tree_with_menus (DOCUMENT *document)
const char *normalized = lookup_extra_string (node, AI_key_normalized);
const ELEMENT * const *menu_directions = lookup_extra_directions (node,
AI_key_menu_directions);
- int automatic_directions = (node->e.c->args.number <= 1);
+ const ELEMENT *argument = node->e.c->contents.list[0];
+ int automatic_directions = (argument->e.c->contents.number <= 1);
if (automatic_directions)
{
@@ -1334,6 +1339,7 @@ nodes_tree (DOCUMENT *document)
for (i = 0; i < root->e.c->contents.number; i++)
{
ELEMENT *node = root->e.c->contents.list[i];
+ ELEMENT *argument;
const char *normalized;
int is_target;
int automatic_directions;
@@ -1352,7 +1358,8 @@ nodes_tree (DOCUMENT *document)
if (is_target && !strcmp (normalized, "Top"))
top_node = node;
- automatic_directions = (node->e.c->args.number <= 1);
+ argument = node->e.c->contents.list[0];
+ automatic_directions = (argument->e.c->contents.number <= 1);
if (automatic_directions)
if (!top_node || node != top_node)
@@ -1421,9 +1428,10 @@ nodes_tree (DOCUMENT *document)
else /* explicit directions */
{
size_t i;
- for (i = 1; i < node->e.c->args.number; i++)
+ for (i = 1; i < argument->e.c->contents.number; i++)
{
- const ELEMENT *direction_element = node->e.c->args.list[i];
+ const ELEMENT *direction_element
+ = argument->e.c->contents.list[i];
int direction = (int) i - 1;
const ELEMENT *manual_content
= lookup_extra_container (direction_element,
@@ -1695,7 +1703,7 @@ new_node_menu_entry (const ELEMENT *node, int
use_sections)
size_t i;
int is_target = (node->flags & EF_is_target);
if (is_target)
- node_name_element = node->e.c->args.list[0];
+ node_name_element = node->e.c->contents.list[0]->e.c->contents.list[0];
if (!node_name_element)
return 0;
@@ -1707,7 +1715,8 @@ new_node_menu_entry (const ELEMENT *node, int
use_sections)
const ELEMENT *associated_section
= lookup_extra_element (node, AI_key_associated_section);
if (associated_section)
- name_element = associated_section->e.c->args.list[0];
+ name_element = associated_section->e.c->contents.list[0]
+ ->e.c->contents.list[0];
else
name_element = node_name_element; /* shouldn't happen */
@@ -1891,12 +1900,13 @@ new_complete_node_menu (const ELEMENT *node, DOCUMENT
*document,
const ELEMENT *associated_part
= lookup_extra_element (child_section,
AI_key_associated_part);
- if (associated_part
- && associated_part->e.c->args.number > 0)
+ if (associated_part)
{
+ const ELEMENT *part_line_arg
+ = associated_part->e.c->contents.list[0]
+ ->e.c->contents.list[0];
ELEMENT *part_title_copy
- = copy_contents (associated_part->e.c->args.list[0],
- ET_NONE);
+ = copy_contents (part_line_arg, ET_NONE);
NAMED_STRING_ELEMENT_LIST *substrings
= new_named_string_element_list ();
ELEMENT *part_title;
@@ -2014,9 +2024,11 @@ print_down_menus (const ELEMENT *node, ELEMENT_STACK
*up_nodes,
= lookup_extra_element (node, AI_key_associated_section);
int new_up_nodes = 0;
if (associated_section)
- node_name_element = associated_section->e.c->args.list[0];
+ node_name_element = associated_section->e.c->contents.list[0]
+ ->e.c->contents.list[0];
else
- node_name_element = node->e.c->args.list[0];
+ node_name_element = node->e.c->contents.list[0]
+ ->e.c->contents.list[0];
node_title_copy = copy_contents (node_name_element, ET_NONE);
diff --git a/tp/Texinfo/XS/structuring_transfo/transformations.c
b/tp/Texinfo/XS/structuring_transfo/transformations.c
index 18cb741731..9d4dbf37bc 100644
--- a/tp/Texinfo/XS/structuring_transfo/transformations.c
+++ b/tp/Texinfo/XS/structuring_transfo/transformations.c
@@ -249,6 +249,7 @@ fill_gaps_in_sectioning (ELEMENT *root, ELEMENT
*commands_heading_content)
ELEMENT *spaces_before_argument
= new_text_element (ET_other_text);
ELEMENT *line_arg = new_element (ET_line_arg);
+ ELEMENT *argument = new_element (ET_argument);
ELEMENT *spaces_after_argument = new_text_element
(ET_other_text);
ELEMENT *empty_line = new_text_element (ET_empty_line);
@@ -256,15 +257,16 @@ fill_gaps_in_sectioning (ELEMENT *root, ELEMENT
*commands_heading_content)
new_section = new_command_element (ET_line_command,
level_to_structuring_command[CM_unnumbered][current_section_level]);
-
text_append (spaces_before_argument->e.text, " ");
new_section->elt_info[eit_spaces_before_argument]
= spaces_before_argument;
text_append (spaces_after_argument->e.text, "\n");
+ add_to_element_contents (new_section, argument);
+
line_arg->elt_info[eit_spaces_after_argument]
= spaces_after_argument;
- add_to_element_args (new_section, line_arg);
+ add_to_element_contents (argument, line_arg);
if (commands_heading_content)
{
@@ -644,12 +646,14 @@ new_node (ERROR_MESSAGE_LIST *error_messages, ELEMENT
*node_tree,
char *non_hyphen_char;
ELEMENT *target = 0;
ELEMENT *appended_text = 0;
+ ELEMENT *argument = new_element (ET_argument);
ELEMENT *node_line_arg = new_element (ET_line_arg);
ELEMENT *spaces_before = new_text_element (ET_other_text);
ELEMENT *spaces_after = new_text_element (ET_other_text);
node = new_command_element (ET_line_command, CM_node);
- add_to_element_args (node, node_line_arg);
+ add_to_element_contents (node, argument);
+ add_to_element_contents (argument, node_line_arg);
text_append (spaces_before->e.text, " ");
text_append (spaces_after->e.text, spaces_after_argument.text);
node->elt_info[eit_spaces_before_argument] = spaces_before;
@@ -824,8 +828,9 @@ insert_nodes_for_sectioning_commands (DOCUMENT *document)
}
else
{
- new_node_tree = copy_contents (content->e.c->args.list[0],
- ET_NONE);
+ const ELEMENT *line_arg
+ = content->e.c->contents.list[0]->e.c->contents.list[0];
+ new_node_tree = copy_contents (line_arg, ET_NONE);
}
added_node = new_node (&document->error_messages, new_node_tree,
document);
@@ -1113,7 +1118,7 @@ get_non_automatic_nodes_with_sections (const ELEMENT
*root)
{
ELEMENT *content = root->e.c->contents.list[i];
if (content->e.c->cmd && content->e.c->cmd == CM_node
- && content->e.c->args.number <= 1)
+ && content->e.c->contents.list[0]->e.c->contents.number <= 1)
{
const ELEMENT *associated_section
= lookup_extra_element (content, AI_key_associated_section);
diff --git a/tp/ext/epub3.pm b/tp/ext/epub3.pm
index 966a3b5992..ead002aab5 100644
--- a/tp/ext/epub3.pm
+++ b/tp/ext/epub3.pm
@@ -758,7 +758,8 @@ EOT
} else {
print $nav_fh "</li>\n";
}
- my $text = _epub_convert_tree_to_text($self, $section->{'args'}->[0]);
+ my $line_arg = $section->{'contents'}->[0]->{'contents'}->[0];
+ my $text = _epub_convert_tree_to_text($self, $line_arg);
$text
= Texinfo::Convert::Utils::add_heading_number($self, $section, $text,
$self->get_conf('NUMBER_SECTIONS'));
diff --git a/tp/init/chm.pm b/tp/init/chm.pm
index 17faceb98a..c51ff00a08 100644
--- a/tp/init/chm.pm
+++ b/tp/init/chm.pm
@@ -350,7 +350,8 @@ sub chm_init($)
$level--;
}
}
- my $text = _chm_convert_tree_to_text($self, $section->{'args'}->[0]);
+ my $line_arg = $section->{'contents'}->[0]->{'contents'}->[0];
+ my $text = _chm_convert_tree_to_text($self, $line_arg);
# should not be needed as end of lines are not converted, end of line
# can be added with invalid nestings.
chomp($text);
diff --git a/tp/t/results/alias/alias_of_added_index.pl
b/tp/t/results/alias/alias_of_added_index.pl
index e6957aa13c..cd8fbdb0e2 100644
--- a/tp/t/results/alias/alias_of_added_index.pl
+++ b/tp/t/results/alias/alias_of_added_index.pl
@@ -88,23 +88,28 @@ $result_trees{'alias_of_added_index'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -119,24 +124,27 @@ $result_trees{'alias_of_added_index'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -196,23 +204,28 @@ $result_trees{'alias_of_added_index'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -228,24 +241,27 @@ $result_trees{'alias_of_added_index'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -299,7 +315,7 @@ $result_trees{'alias_of_added_index'} = {
],
'type' => 'document_root'
};
-$result_trees{'alias_of_added_index'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'alias_of_added_index'}{'contents'}[1];
+$result_trees{'alias_of_added_index'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'alias_of_added_index'}{'contents'}[1];
$result_texis{'alias_of_added_index'} = '@defindex sli
diff --git a/tp/t/results/alias/alias_of_added_index_before_added_index.pl
b/tp/t/results/alias/alias_of_added_index_before_added_index.pl
index f82b89d22e..b924f74fb8 100644
--- a/tp/t/results/alias/alias_of_added_index_before_added_index.pl
+++ b/tp/t/results/alias/alias_of_added_index_before_added_index.pl
@@ -88,23 +88,28 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -119,24 +124,27 @@ $result_trees{'alias_of_added_index_before_added_index'}
= {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -196,23 +204,28 @@ $result_trees{'alias_of_added_index_before_added_index'}
= {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -228,24 +241,27 @@ $result_trees{'alias_of_added_index_before_added_index'}
= {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -299,7 +315,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
],
'type' => 'document_root'
};
-$result_trees{'alias_of_added_index_before_added_index'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'alias_of_added_index_before_added_index'}{'contents'}[1];
+$result_trees{'alias_of_added_index_before_added_index'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'alias_of_added_index_before_added_index'}{'contents'}[1];
$result_texis{'alias_of_added_index_before_added_index'} = '@alias new =
sliindex
diff --git a/tp/t/results/conditionals/cond.pl
b/tp/t/results/conditionals/cond.pl
index a70a45af64..d50124267f 100644
--- a/tp/t/results/conditionals/cond.pl
+++ b/tp/t/results/conditionals/cond.pl
@@ -272,23 +272,28 @@ $result_trees{'cond'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -304,24 +309,27 @@ $result_trees{'cond'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'conditionals'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -340,24 +348,27 @@ $result_trees{'cond'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
index 13d3819a75..520e3a3821 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
@@ -271,23 +271,28 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -303,24 +308,27 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'conditionals'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -339,24 +347,27 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
index 5cbc0112e3..f1f4680c82 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
@@ -271,23 +271,28 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -303,24 +308,27 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'conditionals'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -339,24 +347,27 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/conditionals/cond_info.pl
b/tp/t/results/conditionals/cond_info.pl
index e358f1e481..1075148dc5 100644
--- a/tp/t/results/conditionals/cond_info.pl
+++ b/tp/t/results/conditionals/cond_info.pl
@@ -272,23 +272,28 @@ $result_trees{'cond_info'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -304,24 +309,27 @@ $result_trees{'cond_info'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'conditionals'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -340,24 +348,27 @@ $result_trees{'cond_info'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
index 70f79962d1..e4952edf86 100644
--- a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
@@ -271,23 +271,28 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -303,24 +308,27 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'conditionals'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -339,24 +347,27 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git
a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index 46b4b23af8..cb62f2e18a 100644
--- a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -272,23 +272,28 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} =
{
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -304,24 +309,27 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} =
{
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'conditionals'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -340,24 +348,27 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} =
{
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index 11c73ee36e..dc35051df8 100644
--- a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -272,23 +272,28 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -304,24 +309,27 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'conditionals'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -340,24 +348,27 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/conditionals/cond_xml.pl
b/tp/t/results/conditionals/cond_xml.pl
index 1d7c268010..876bfa7ac1 100644
--- a/tp/t/results/conditionals/cond_xml.pl
+++ b/tp/t/results/conditionals/cond_xml.pl
@@ -272,23 +272,28 @@ $result_trees{'cond_xml'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -304,24 +309,27 @@ $result_trees{'cond_xml'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'conditionals'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -340,24 +348,27 @@ $result_trees{'cond_xml'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/conditionals/defcondx_Dbar.pl
b/tp/t/results/conditionals/defcondx_Dbar.pl
index 185df86df3..adcb3e59a7 100644
--- a/tp/t/results/conditionals/defcondx_Dbar.pl
+++ b/tp/t/results/conditionals/defcondx_Dbar.pl
@@ -73,24 +73,27 @@ $result_trees{'defcondx_Dbar'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'deffnx inside conditional'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'deffnx inside conditional'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/conditionals/defcondx_Ubar.pl
b/tp/t/results/conditionals/defcondx_Ubar.pl
index 4aea091340..c0555a6a5f 100644
--- a/tp/t/results/conditionals/defcondx_Ubar.pl
+++ b/tp/t/results/conditionals/defcondx_Ubar.pl
@@ -73,24 +73,27 @@ $result_trees{'defcondx_Ubar'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'deffnx inside conditional'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'deffnx inside conditional'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index 50bdc50c96..adfd128245 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -11,23 +11,28 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'at_commands_in_raw'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -138,23 +146,28 @@ $result_trees{'at_commands_in_raw'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -170,24 +183,27 @@ $result_trees{'at_commands_in_raw'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1061,9 +1077,9 @@ $result_trees{'at_commands_in_raw'} = {
],
'type' => 'document_root'
};
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'at_commands_in_raw'}{'contents'}[3];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[16]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'at_commands_in_raw'}{'contents'}[3];
$result_texis{'at_commands_in_raw'} = '@node Top
@top top
diff --git a/tp/t/results/converters_tests/combined_fonts.pl
b/tp/t/results/converters_tests/combined_fonts.pl
index bf0fca5d16..7113363cd4 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -53,23 +53,28 @@ $result_trees{'combined_fonts'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -84,24 +89,27 @@ $result_trees{'combined_fonts'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top section'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top section'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -119,23 +127,28 @@ $result_trees{'combined_fonts'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -150,24 +163,27 @@ $result_trees{'combined_fonts'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl
b/tp/t/results/converters_tests/commands_in_sc.pl
index ab22aa940d..0334047c6b 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -11,23 +11,28 @@ $result_trees{'commands_in_sc'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'commands_in_sc'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'commands in sc'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'commands in sc'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'commands_in_sc'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'commands_in_sc'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -682,10 +698,10 @@ $result_trees{'commands_in_sc'} = {
],
'type' => 'document_root'
};
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[1];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[3];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[1];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[3];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0];
$result_texis{'commands_in_sc'} = '@node Top
@top commands in sc
diff --git a/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
b/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
index 21b4aae62c..077651fe2b 100644
--- a/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
+++ b/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
@@ -245,23 +245,28 @@ $result_trees{'commands_in_settitle_with_title'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -276,24 +281,27 @@ $result_trees{'commands_in_settitle_with_title'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -311,23 +319,28 @@ $result_trees{'commands_in_settitle_with_title'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -342,24 +355,27 @@ $result_trees{'commands_in_settitle_with_title'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/converters_tests/commands_in_var.pl
b/tp/t/results/converters_tests/commands_in_var.pl
index 31c9b28f20..98c0bc8605 100644
--- a/tp/t/results/converters_tests/commands_in_var.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -11,23 +11,28 @@ $result_trees{'commands_in_var'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'commands_in_var'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'commands in var'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'commands in var'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'commands_in_var'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'commands_in_var'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -682,10 +698,10 @@ $result_trees{'commands_in_var'} = {
],
'type' => 'document_root'
};
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[1];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[3];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[1];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[3];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0];
$result_texis{'commands_in_var'} = '@node Top
@top commands in var
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index 5f7209f844..01f7284279 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -11,23 +11,28 @@ $result_trees{'complex_nestings'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'complex_nestings'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'complex_nestings'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'complex_nestings'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1189,12 +1205,12 @@ $result_trees{'complex_nestings'} = {
],
'type' => 'document_root'
};
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'complex_nestings'} = '@node Top
@top top
diff --git a/tp/t/results/converters_tests/contents_at_document_begin.pl
b/tp/t/results/converters_tests/contents_at_document_begin.pl
index b17220ddb2..f9ba2b04e1 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin.pl
@@ -53,23 +53,28 @@ $result_trees{'contents_at_document_begin'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'contents_at_document_begin'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Contents at beginning'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Contents at beginning'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -241,23 +249,28 @@ $result_trees{'contents_at_document_begin'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'contents_at_document_begin'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter 1'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter 1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -337,7 +353,7 @@ $result_trees{'contents_at_document_begin'} = {
],
'type' => 'document_root'
};
-$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_texis{'contents_at_document_begin'} = '\\input texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
index 4e41dbeb86..a1193755c4 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
@@ -53,23 +53,28 @@ $result_trees{'contents_at_document_begin_inline'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'contents_at_document_begin_inline'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Contents at beginning'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Contents at beginning'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -241,23 +249,28 @@ $result_trees{'contents_at_document_begin_inline'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'contents_at_document_begin_inline'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter 1'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter 1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -337,7 +353,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
],
'type' => 'document_root'
};
-$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_texis{'contents_at_document_begin_inline'} = '\\input texinfo @c
-*-texinfo-*-
diff --git
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
index 3fc4a29e2d..f95871fe3d 100644
---
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
+++
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
@@ -53,23 +53,28 @@
$result_trees{'contents_at_document_begin_separate_element'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -85,24 +90,27 @@
$result_trees{'contents_at_document_begin_separate_element'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Contents at beginning'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Contents at beginning'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -241,23 +249,28 @@
$result_trees{'contents_at_document_begin_separate_element'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -273,24 +286,27 @@
$result_trees{'contents_at_document_begin_separate_element'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter 1'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter 1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -337,7 +353,7 @@
$result_trees{'contents_at_document_begin_separate_element'} = {
],
'type' => 'document_root'
};
-$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_texis{'contents_at_document_begin_separate_element'} = '\\input
texinfo @c -*-texinfo-*-
diff --git
a/tp/t/results/converters_tests/conversion_with_undef_customization.pl
b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
index 9a9828e9fd..d5101f60e3 100644
--- a/tp/t/results/converters_tests/conversion_with_undef_customization.pl
+++ b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
@@ -16,23 +16,28 @@ $result_trees{'conversion_with_undef_customization'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'conversion_with_undef_customization'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -115,39 +123,44 @@ $result_trees{'conversion_with_undef_customization'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- },
- {
- 'cmdname' => '^',
'contents' => [
{
+ 'text' => 'chap'
+ },
+ {
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 7
+ }
}
],
- 'source_info' => {
- 'line_nr' => 7
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap_00ea'
@@ -162,40 +175,43 @@ $result_trees{'conversion_with_undef_customization'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- },
- {
- 'cmdname' => '^',
'contents' => [
{
+ 'text' => 'Chap'
+ },
+ {
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 8
+ }
}
],
- 'source_info' => {
- 'line_nr' => 8
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -311,23 +327,28 @@ $result_trees{'conversion_with_undef_customization'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'sec'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'sec'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -343,24 +364,27 @@ $result_trees{'conversion_with_undef_customization'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Section'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Section'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -614,8 +638,8 @@ $result_trees{'conversion_with_undef_customization'} = {
],
'type' => 'document_root'
};
-$result_trees{'conversion_with_undef_customization'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'conversion_with_undef_customization'}{'contents'}[3];
-$result_trees{'conversion_with_undef_customization'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'conversion_with_undef_customization'}{'contents'}[5];
+$result_trees{'conversion_with_undef_customization'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'conversion_with_undef_customization'}{'contents'}[3];
+$result_trees{'conversion_with_undef_customization'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'conversion_with_undef_customization'}{'contents'}[5];
$result_texis{'conversion_with_undef_customization'} = '@node Top
@top top
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index 5fb10a0960..03328ca5a0 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -16,23 +16,28 @@ $result_trees{'definition_commands'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'definition_commands'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top section'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top section'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -82,23 +90,28 @@ $result_trees{'definition_commands'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -113,24 +126,27 @@ $result_trees{'definition_commands'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -20042,84 +20058,84 @@ $result_trees{'definition_commands'} = {
],
'type' => 'document_root'
};
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[6]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[8]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[9]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[10]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[11]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[12]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[13]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[14]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[6]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[8]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[9]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[10]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[11]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[12]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[13]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[14]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[14]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[16]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[6]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[8]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[9]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[10]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[11]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[12]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[13]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[14]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[6]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[8]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[9]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[10]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[11]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[12]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[13]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[14]{'extra'}{'element_node'}
= $result_trees{'definition_commands'}{'contents'}[3];
$result_texis{'definition_commands'} = '@node Top
@top top section
diff --git a/tp/t/results/converters_tests/extension_undef.pl
b/tp/t/results/converters_tests/extension_undef.pl
index 47c811fcf7..3ef7704bc4 100644
--- a/tp/t/results/converters_tests/extension_undef.pl
+++ b/tp/t/results/converters_tests/extension_undef.pl
@@ -25,24 +25,27 @@ $result_trees{'extension_undef'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -60,23 +63,28 @@ $result_trees{'extension_undef'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -91,23 +99,28 @@ $result_trees{'extension_undef'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'chapter',
'extra' => {
'section_number' => '1'
},
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl
b/tp/t/results/converters_tests/footnote_no_number.pl
index f746b4840c..91f4c2f86d 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -11,23 +11,28 @@ $result_trees{'footnote_no_number'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'footnote_no_number'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'footnote_no_number'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'footnote_no_number'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index 049df1dc63..eb7143ca21 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -11,23 +11,28 @@ $result_trees{'footnote_no_number_separate'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'footnote_no_number_separate'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'footnote_no_number_separate'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'footnote_no_number_separate'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/converters_tests/form_feeds.pl
b/tp/t/results/converters_tests/form_feeds.pl
index 6462438a9a..4454768c34 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -11,24 +11,27 @@ $result_trees{'form_feeds'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -49,24 +52,27 @@ $result_trees{'form_feeds'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapnode'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapnode'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1355,13 +1361,13 @@ $result_trees{'form_feeds'} = {
],
'type' => 'document_root'
};
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'form_feeds'}{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'form_feeds'}{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[5]{'extra'}{'float'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'extra'}{'caption'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'extra'}{'shortcaption'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[5];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[32]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'form_feeds'}{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[32]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'form_feeds'}{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'contents'}[5]{'extra'}{'float'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'extra'}{'caption'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'extra'}{'shortcaption'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'contents'}[5];
$result_texis{'form_feeds'} = '@node Top
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 6982f9521a..0580c95700 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -55,23 +55,28 @@ $result_trees{'frenchspacing_and_code'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -86,24 +91,27 @@ $result_trees{'frenchspacing_and_code'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -121,23 +129,28 @@ $result_trees{'frenchspacing_and_code'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter frenchspacing'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter frenchspacing'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter-frenchspacing'
@@ -152,24 +165,27 @@ $result_trees{'frenchspacing_and_code'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap frenchspacing'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap frenchspacing'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -997,23 +1013,28 @@ $result_trees{'frenchspacing_and_code'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap no'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap no'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap-no'
@@ -1028,24 +1049,27 @@ $result_trees{'frenchspacing_and_code'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap no'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap no'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1838,10 +1862,10 @@ $result_trees{'frenchspacing_and_code'} = {
],
'type' => 'document_root'
};
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'frenchspacing_and_code'}{'contents'}[3];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'frenchspacing_and_code'}{'contents'}[3];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'frenchspacing_and_code'}{'contents'}[5];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'frenchspacing_and_code'}{'contents'}[5];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'frenchspacing_and_code'}{'contents'}[3];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'frenchspacing_and_code'}{'contents'}[3];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'frenchspacing_and_code'}{'contents'}[5];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'frenchspacing_and_code'}{'contents'}[5];
$result_texis{'frenchspacing_and_code'} = '
@frenchspacing on
diff --git a/tp/t/results/converters_tests/image_formatting.pl
b/tp/t/results/converters_tests/image_formatting.pl
index 078b8e42c1..3090523eaa 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -11,23 +11,28 @@ $result_trees{'image_formatting'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'image_formatting'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'image_formatting'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'image_formatting'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index ddfd22225e..3bd883c3d5 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -11,23 +11,28 @@ $result_trees{'index_entry_in_preformatted'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'index_entry_in_preformatted'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'index_entry_in_preformatted'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'index_entry_in_preformatted'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -334,9 +350,9 @@ $result_trees{'index_entry_in_preformatted'} = {
],
'type' => 'document_root'
};
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
$result_texis{'index_entry_in_preformatted'} = '@node Top
@top top
diff --git a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
index bb3c0cf02a..f89a54ce67 100644
--- a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
+++ b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
@@ -31,23 +31,28 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'indices_in_begin_tables_lists'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -99,23 +107,28 @@ $result_trees{'indices_in_begin_tables_lists'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -131,24 +144,27 @@ $result_trees{'indices_in_begin_tables_lists'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3644,23 +3660,28 @@ $result_trees{'indices_in_begin_tables_lists'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'printindex'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'printindex'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -3677,24 +3698,27 @@ $result_trees{'indices_in_begin_tables_lists'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'printindex'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'printindex'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3841,49 +3865,49 @@ $result_trees{'indices_in_begin_tables_lists'} = {
],
'type' => 'document_root'
};
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[18]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[18]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[18]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[20]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[20]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[22]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[26]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[28]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[30]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[32]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[32]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[34]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[36]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[38]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[38]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[40]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[40]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'indices_in_begin_tables_lists'} = '\\input texinfo.tex
diff --git
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
index 05e4d65ac5..e3d6bbffb2 100644
---
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
+++
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
@@ -31,23 +31,28 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -63,24 +68,27 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -99,23 +107,28 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -131,24 +144,27 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3646,23 +3662,28 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'printindex'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'printindex'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -3679,24 +3700,27 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'printindex'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'printindex'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3843,49 +3867,49 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[12]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[16]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[18]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[18]{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[18]{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[20]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[20]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[22]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[24]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[26]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[28]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[30]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[32]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[32]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[34]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[36]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[38]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[38]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[40]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[40]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'indices_in_begin_tables_lists_entries_after_item'} = '\\input
texinfo.tex
diff --git a/tp/t/results/converters_tests/link.pl
b/tp/t/results/converters_tests/link.pl
index a26b1f4da3..6d9e6d16f0 100644
--- a/tp/t/results/converters_tests/link.pl
+++ b/tp/t/results/converters_tests/link.pl
@@ -11,23 +11,28 @@ $result_trees{'link'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'One'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'One'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'One'
@@ -42,24 +47,27 @@ $result_trees{'link'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'ONEX'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'ONEX'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -93,24 +101,27 @@ $result_trees{'link'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Two'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Two'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -513,12 +524,12 @@ $result_trees{'link'} = {
],
'type' => 'document_root'
};
-$result_trees{'link'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'link'}{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'link'} = '@node One
@chapter ONEX
diff --git a/tp/t/results/converters_tests/non_empty_part.pl
b/tp/t/results/converters_tests/non_empty_part.pl
index dc95ea98d2..dceeaf9ced 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -11,24 +11,27 @@ $result_trees{'non_empty_part'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'part before'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'part before'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -60,23 +63,28 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -91,24 +99,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -277,24 +288,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'part I'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'part I'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -326,24 +340,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap in Top node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap in Top node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -364,24 +381,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Part II'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Part II'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -413,23 +433,28 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'part chapter node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'part chapter node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'part-chapter-node'
@@ -444,24 +469,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'part III'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'part III'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -493,24 +521,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter with part node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter with part node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -531,24 +562,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Part IV'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Part IV'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -580,24 +614,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Part V'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Part V'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -629,24 +666,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'with part no node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'with part no node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -667,24 +707,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Part VI'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Part VI'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -716,24 +759,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'node between part and chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'node between part and chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -754,24 +800,27 @@ $result_trees{'non_empty_part'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter after part node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter after part node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -794,8 +843,8 @@ $result_trees{'non_empty_part'} = {
],
'type' => 'document_root'
};
-$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
$result_trees{'non_empty_part'}{'contents'}[3]{'extra'}{'associated_part'} =
$result_trees{'non_empty_part'}{'contents'}[1];
$result_trees{'non_empty_part'}{'contents'}[5]{'extra'}{'associated_part'} =
$result_trees{'non_empty_part'}{'contents'}[4];
$result_trees{'non_empty_part'}{'contents'}[9]{'extra'}{'associated_part'} =
$result_trees{'non_empty_part'}{'contents'}[8];
diff --git a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
index 2dd553c3f0..c9be839cc0 100644
--- a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
+++ b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
@@ -11,24 +11,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'part before'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'part before'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -60,23 +63,28 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -91,24 +99,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -277,24 +288,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'part I'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'part I'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -326,24 +340,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap in Top node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap in Top node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -364,24 +381,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Part II'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Part II'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -413,23 +433,28 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'part chapter node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'part chapter node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'part-chapter-node'
@@ -444,24 +469,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'part III'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'part III'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -493,24 +521,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter with part node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter with part node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -531,24 +562,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Part IV'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Part IV'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -580,24 +614,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Part V'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Part V'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -629,24 +666,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'with part no node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'with part no node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -667,24 +707,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Part VI'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Part VI'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -716,24 +759,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'node between part and chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'node between part and chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -754,24 +800,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter after part node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter after part node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -794,8 +843,8 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
],
'type' => 'document_root'
};
-$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'extra'}{'associated_part'}
= $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[1];
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[5]{'extra'}{'associated_part'}
= $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[4];
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[9]{'extra'}{'associated_part'}
= $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[8];
diff --git
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index 4e29660835..f869b3115a 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -16,23 +16,28 @@ $result_trees{'printindex_merged_indices_code_style'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'printindex_merged_indices_code_style'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -82,23 +90,28 @@ $result_trees{'printindex_merged_indices_code_style'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -114,24 +127,27 @@ $result_trees{'printindex_merged_indices_code_style'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -616,11 +632,11 @@ $result_trees{'printindex_merged_indices_code_style'} = {
],
'type' => 'document_root'
};
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'element_node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[22]{'extra'}{'element_node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
$result_texis{'printindex_merged_indices_code_style'} = '@node Top
@top top
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 56bfd263fd..3029211a97 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -32,23 +32,28 @@ $result_trees{'ref_in_sectioning'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -63,136 +68,139 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'for example '
- },
- {
- 'cmdname' => 'ref',
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'node'
- }
- ],
- 'extra' => {
- 'node_content' => {
- 'contents' => [
- {}
- ]
- },
- 'normalized' => 'node'
- },
- 'type' => 'brace_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 4
- }
- },
- {
- 'text' => ' ('
- },
- {
- 'cmdname' => 'pxref',
- 'contents' => [
+ 'text' => 'for example '
+ },
{
+ 'cmdname' => 'ref',
'contents' => [
{
- 'text' => 'node'
- }
- ],
- 'extra' => {
- 'node_content' => {
'contents' => [
- {}
- ]
- },
- 'normalized' => 'node'
- },
- 'type' => 'brace_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 4
- }
- },
- {
- 'text' => ') ('
- },
- {
- 'cmdname' => 'pxref',
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ },
+ 'normalized' => 'node'
+ },
+ 'type' => 'brace_arg'
}
],
- 'extra' => {
- 'node_content' => {
- 'contents' => [
- {}
- ]
- }
- },
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 4
+ }
},
{
- 'type' => 'brace_arg'
+ 'text' => ' ('
},
{
+ 'cmdname' => 'pxref',
'contents' => [
{
- 'text' => 'file'
+ 'contents' => [
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ },
+ 'normalized' => 'node'
+ },
+ 'type' => 'brace_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 4
+ }
+ },
+ {
+ 'text' => ') ('
},
{
+ 'cmdname' => 'pxref',
'contents' => [
{
- 'text' => 'Manual'
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ }
+ },
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'file'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'Manual'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 4
+ }
+ },
+ {
+ 'text' => ')'
}
],
- 'source_info' => {
- 'line_nr' => 4
- }
- },
- {
- 'text' => ')'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -359,23 +367,28 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'node'
@@ -390,84 +403,87 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'xref',
'contents' => [
{
+ 'cmdname' => 'xref',
'contents' => [
{
- 'text' => 'node'
- }
- ],
- 'extra' => {
- 'node_content' => {
'contents' => [
- {}
- ]
- }
- },
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'contents' => [
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ }
+ },
+ 'type' => 'brace_arg'
+ },
{
- 'text' => 'title'
- }
- ],
- 'type' => 'brace_arg'
- },
- {
- 'contents' => [
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'title'
+ }
+ ],
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'file name'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
+ },
{
- 'text' => 'file name'
+ 'contents' => [
+ {
+ 'text' => 'Manual'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 12
+ }
},
{
- 'contents' => [
- {
- 'text' => 'Manual'
- }
- ],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'text' => '.'
}
],
- 'source_info' => {
- 'line_nr' => 12
- }
- },
- {
- 'text' => '.'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -487,23 +503,28 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -518,48 +539,51 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ref',
'contents' => [
{
+ 'cmdname' => 'ref',
'contents' => [
{
- 'text' => 'node'
- }
- ],
- 'extra' => {
- 'node_content' => {
'contents' => [
- {}
- ]
- },
- 'normalized' => 'node'
- },
- 'type' => 'brace_arg'
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ },
+ 'normalized' => 'node'
+ },
+ 'type' => 'brace_arg'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 15
+ }
+ },
+ {
+ 'text' => ' just node'
}
],
- 'source_info' => {
- 'line_nr' => 15
- }
- },
- {
- 'text' => ' just node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -579,136 +603,139 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'for example '
- },
- {
- 'cmdname' => 'ref',
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'node'
- }
- ],
- 'extra' => {
- 'node_content' => {
- 'contents' => [
- {}
- ]
- },
- 'normalized' => 'node'
- },
- 'type' => 'brace_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 17
- }
- },
- {
- 'text' => ' ('
- },
- {
- 'cmdname' => 'pxref',
- 'contents' => [
+ 'text' => 'for example '
+ },
{
+ 'cmdname' => 'ref',
'contents' => [
{
- 'text' => 'node'
- }
- ],
- 'extra' => {
- 'node_content' => {
'contents' => [
- {}
- ]
- },
- 'normalized' => 'node'
- },
- 'type' => 'brace_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 17
- }
- },
- {
- 'text' => ') ('
- },
- {
- 'cmdname' => 'pxref',
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ },
+ 'normalized' => 'node'
+ },
+ 'type' => 'brace_arg'
}
],
- 'extra' => {
- 'node_content' => {
- 'contents' => [
- {}
- ]
- }
- },
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 17
+ }
},
{
- 'type' => 'brace_arg'
+ 'text' => ' ('
},
{
+ 'cmdname' => 'pxref',
'contents' => [
{
- 'text' => 'file'
+ 'contents' => [
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ },
+ 'normalized' => 'node'
+ },
+ 'type' => 'brace_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 17
+ }
+ },
+ {
+ 'text' => ') ('
},
{
+ 'cmdname' => 'pxref',
'contents' => [
{
- 'text' => 'Manual'
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ }
+ },
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'file'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'Manual'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 17
+ }
+ },
+ {
+ 'text' => ')'
}
],
- 'source_info' => {
- 'line_nr' => 17
- }
- },
- {
- 'text' => ')'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -728,61 +755,64 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ref',
'contents' => [
{
+ 'cmdname' => 'ref',
'contents' => [
{
- 'text' => 'node'
- }
- ],
- 'extra' => {
- 'node_content' => {
'contents' => [
- {}
- ]
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ },
+ 'normalized' => 'node'
+ },
+ 'type' => 'brace_arg'
},
- 'normalized' => 'node'
- },
- 'type' => 'brace_arg'
- },
- {
- 'contents' => [
{
- 'text' => 'cross ref name'
+ 'contents' => [
+ {
+ 'text' => 'cross ref name'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 19
+ }
+ },
+ {
+ 'text' => ' node, crossref arg2'
}
],
- 'source_info' => {
- 'line_nr' => 19
- }
- },
- {
- 'text' => ' node, crossref arg2'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -802,90 +832,93 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ref',
'contents' => [
{
+ 'cmdname' => 'ref',
'contents' => [
{
- 'cmdname' => 'code',
'contents' => [
{
+ 'cmdname' => 'code',
'contents' => [
{
- 'text' => 'node'
+ 'contents' => [
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 21
+ }
}
],
- 'source_info' => {
- 'line_nr' => 21
- }
- }
- ],
- 'extra' => {
- 'node_content' => {
- 'contents' => [
- {}
- ]
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ },
+ 'normalized' => 'node'
+ },
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
},
- 'normalized' => 'node'
- },
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'contents' => [
{
- 'cmdname' => 'samp',
'contents' => [
{
+ 'cmdname' => 'samp',
'contents' => [
{
- 'text' => 'title'
+ 'contents' => [
+ {
+ 'text' => 'title'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 21
+ }
}
],
- 'source_info' => {
- 'line_nr' => 21
- }
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 21
+ }
+ },
+ {
+ 'text' => ' code node, samptitle arg3'
}
],
- 'source_info' => {
- 'line_nr' => 21
- }
- },
- {
- 'text' => ' code node, samptitle arg3'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -905,79 +938,82 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ref',
'contents' => [
{
+ 'cmdname' => 'ref',
'contents' => [
{
- 'cmdname' => 'code',
'contents' => [
{
+ 'cmdname' => 'code',
'contents' => [
{
- 'text' => 'node'
+ 'contents' => [
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 23
+ }
}
],
- 'source_info' => {
- 'line_nr' => 23
- }
- }
- ],
- 'extra' => {
- 'node_content' => {
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ }
+ },
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
'contents' => [
- {}
- ]
+ {
+ 'text' => 'file name'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
- },
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
+ ],
+ 'source_info' => {
+ 'line_nr' => 23
+ }
},
{
- 'contents' => [
- {
- 'text' => 'file name'
- }
- ],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'text' => ' code node, file name'
}
],
- 'source_info' => {
- 'line_nr' => 23
- }
- },
- {
- 'text' => ' code node, file name'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -997,72 +1033,75 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ref',
'contents' => [
{
+ 'cmdname' => 'ref',
'contents' => [
{
- 'text' => 'node'
- }
- ],
- 'extra' => {
- 'node_content' => {
'contents' => [
- {}
- ]
- }
- },
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'contents' => [
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ }
+ },
+ 'type' => 'brace_arg'
+ },
{
- 'text' => 'Manual'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
},
- 'spaces_before_argument' => {
- 'text' => ' '
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'Manual'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ },
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
- },
- 'type' => 'brace_arg'
+ ],
+ 'source_info' => {
+ 'line_nr' => 25
+ }
+ },
+ {
+ 'text' => ' node and manual'
}
],
- 'source_info' => {
- 'line_nr' => 25
- }
- },
- {
- 'text' => ' node and manual'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1082,72 +1121,75 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ref',
'contents' => [
{
+ 'cmdname' => 'ref',
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'extra' => {
- 'node_content' => {
'contents' => [
- {}
- ]
- }
- },
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ }
+ },
+ 'type' => 'brace_arg'
+ },
{
- 'text' => 'Manual'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
},
- 'spaces_before_argument' => {
- 'text' => ' '
+ {
+ 'contents' => [
+ {
+ 'text' => 'Manual'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ },
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
- },
- 'type' => 'brace_arg'
+ ],
+ 'source_info' => {
+ 'line_nr' => 27
+ }
+ },
+ {
+ 'text' => ' Top and manual'
}
],
- 'source_info' => {
- 'line_nr' => 27
- }
- },
- {
- 'text' => ' Top and manual'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1167,60 +1209,63 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ref',
'contents' => [
{
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
+ 'cmdname' => 'ref',
'contents' => [
{
- 'text' => 'Manual'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
},
- 'spaces_before_argument' => {
- 'text' => ' '
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'Manual'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ },
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
- },
- 'type' => 'brace_arg'
+ ],
+ 'source_info' => {
+ 'line_nr' => 29
+ }
+ },
+ {
+ 'text' => ' no node just manual'
}
],
- 'source_info' => {
- 'line_nr' => 29
- }
- },
- {
- 'text' => ' no node just manual'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1240,54 +1285,57 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ref',
'contents' => [
{
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
+ 'cmdname' => 'ref',
'contents' => [
{
- 'text' => 'file name'
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'file name'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 31
+ }
+ },
+ {
+ 'text' => ' no node just file name'
}
],
- 'source_info' => {
- 'line_nr' => 31
- }
- },
- {
- 'text' => ' no node just file name'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1307,73 +1355,76 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
- 'contents' => [
- {
- 'cmdname' => 'inforef',
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'a'
- }
- ],
- 'extra' => {
- 'node_content' => {
- 'contents' => [
- {}
- ]
- }
- },
- 'type' => 'brace_arg'
- },
+ 'contents' => [
+ {
+ 'contents' => [
{
+ 'cmdname' => 'inforef',
'contents' => [
{
- 'text' => 'b'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ }
+ },
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 33
+ }
},
{
- 'contents' => [
- {
- 'text' => 'c'
- }
- ],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
+ 'text' => ' inforef a b c'
}
],
- 'source_info' => {
- 'line_nr' => 33
- }
- },
- {
- 'text' => ' inforef a b c'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1393,80 +1444,83 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '('
- },
- {
- 'cmdname' => 'pxref',
'contents' => [
{
+ 'text' => '('
+ },
+ {
+ 'cmdname' => 'pxref',
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'extra' => {
- 'node_content' => {
'contents' => [
- {}
- ]
- }
- },
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ }
+ },
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ },
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
},
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'contents' => [
{
- 'text' => 'file name'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
},
- 'spaces_before_argument' => {
- 'text' => ' '
+ {
+ 'contents' => [
+ {
+ 'text' => 'file name'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ },
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
- },
- 'type' => 'brace_arg'
+ ],
+ 'source_info' => {
+ 'line_nr' => 35
+ }
+ },
+ {
+ 'text' => ') pxref Top file name, spaces'
}
],
- 'source_info' => {
- 'line_nr' => 35
- }
- },
- {
- 'text' => ') pxref Top file name, spaces'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1486,60 +1540,63 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '('
- },
- {
- 'cmdname' => 'pxref',
'contents' => [
{
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
+ 'text' => '('
},
{
+ 'cmdname' => 'pxref',
'contents' => [
{
- 'text' => 'file name'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
},
- 'spaces_before_argument' => {
- 'text' => ' '
+ {
+ 'contents' => [
+ {
+ 'text' => 'file name'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ },
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
}
- },
- 'type' => 'brace_arg'
+ ],
+ 'source_info' => {
+ 'line_nr' => 37
+ }
+ },
+ {
+ 'text' => ') pxref file name only, spaces'
}
],
- 'source_info' => {
- 'line_nr' => 37
- }
- },
- {
- 'text' => ') pxref file name only, spaces'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1559,61 +1616,64 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'xref',
'contents' => [
{
+ 'cmdname' => 'xref',
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'extra' => {
- 'node_content' => {
'contents' => [
- {}
- ]
- }
- },
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => {
+ 'contents' => [
+ {}
+ ]
+ }
+ },
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
{
- 'text' => 'filename'
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'filename'
+ }
+ ],
+ 'type' => 'brace_arg'
}
],
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 39
+ }
+ },
+ {
+ 'text' => ', xref Top filename only, no spaces'
}
],
- 'source_info' => {
- 'line_nr' => 39
- }
- },
- {
- 'text' => ', xref Top filename only, no spaces'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1633,49 +1693,52 @@ $result_trees{'ref_in_sectioning'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'xref',
'contents' => [
{
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
- 'type' => 'brace_arg'
- },
- {
+ 'cmdname' => 'xref',
'contents' => [
{
- 'text' => 'filename'
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'filename'
+ }
+ ],
+ 'type' => 'brace_arg'
}
],
- 'type' => 'brace_arg'
+ 'source_info' => {
+ 'line_nr' => 41
+ }
+ },
+ {
+ 'text' => '. xref filename only, no spaces'
}
],
- 'source_info' => {
- 'line_nr' => 41
- }
- },
- {
- 'text' => '. xref filename only, no spaces'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1697,24 +1760,24 @@ $result_trees{'ref_in_sectioning'} = {
],
'type' => 'document_root'
};
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_sectioning'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'ref_in_sectioning'} = '@contents
diff --git
a/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
b/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
index f1f134ea31..aee8309777 100644
--- a/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
+++ b/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
@@ -16,23 +16,28 @@ $result_trees{'reference_for_formatting_customizations'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -48,24 +53,27 @@ $result_trees{'reference_for_formatting_customizations'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -84,23 +92,28 @@ $result_trees{'reference_for_formatting_customizations'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapt'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapt'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapt'
@@ -116,24 +129,27 @@ $result_trees{'reference_for_formatting_customizations'}
= {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/converters_tests/references_to_top_no_top_output.pl
b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
index 9e5c918db1..53e7f24674 100644
--- a/tp/t/results/converters_tests/references_to_top_no_top_output.pl
+++ b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
@@ -162,23 +162,28 @@ $result_trees{'references_to_top_no_top_output'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -193,24 +198,27 @@ $result_trees{'references_to_top_no_top_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -606,23 +614,28 @@ $result_trees{'references_to_top_no_top_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -638,24 +651,27 @@ $result_trees{'references_to_top_no_top_output'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1086,20 +1102,20 @@ $result_trees{'references_to_top_no_top_output'} = {
],
'type' => 'document_root'
};
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'caption'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[2];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'float_section'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'element_node'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[1];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[3];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'float_section'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[4];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[13];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[13]{'extra'}{'caption'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[13]{'contents'}[2];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[13]{'extra'}{'float_section'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[15]{'extra'}{'element_node'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[1];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[3];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[8]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[8];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[8]{'extra'}{'caption'}
=
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[8]{'contents'}[2];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[8]{'extra'}{'float_section'}
= $result_trees{'references_to_top_no_top_output'}{'contents'}[4];
$result_texis{'references_to_top_no_top_output'} = '
@setfilename references_to_top_no_top_output.info
diff --git a/tp/t/results/converters_tests/refs_formatting.pl
b/tp/t/results/converters_tests/refs_formatting.pl
index 643424be81..d444ff660d 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -11,23 +11,28 @@ $result_trees{'refs_formatting'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -42,24 +47,27 @@ $result_trees{'refs_formatting'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -2819,52 +2827,52 @@ $result_trees{'refs_formatting'} = {
],
'type' => 'document_root'
};
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[30]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[34]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[38]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[42]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[46]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[50]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[54]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[14]{'contents'}[0]{'contents'}[0];
$result_texis{'refs_formatting'} = '@node chapter
@chapter chapter
diff --git a/tp/t/results/converters_tests/sections_and_printindex.pl
b/tp/t/results/converters_tests/sections_and_printindex.pl
index 4f00938b38..b31070d425 100644
--- a/tp/t/results/converters_tests/sections_and_printindex.pl
+++ b/tp/t/results/converters_tests/sections_and_printindex.pl
@@ -11,23 +11,28 @@ $result_trees{'sections_and_printindex'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'sections_and_printindex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'for example'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'for example'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'sections_and_printindex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'node'
@@ -108,24 +121,27 @@ $result_trees{'sections_and_printindex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -181,23 +197,28 @@ $result_trees{'sections_and_printindex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'sec'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'sec'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -213,24 +234,27 @@ $result_trees{'sections_and_printindex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Sec'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Sec'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -286,24 +310,27 @@ $result_trees{'sections_and_printindex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'appendix',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'App'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'App'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'appendix',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -362,8 +389,8 @@ $result_trees{'sections_and_printindex'} = {
],
'type' => 'document_root'
};
-$result_trees{'sections_and_printindex'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'sections_and_printindex'}{'contents'}[3];
-$result_trees{'sections_and_printindex'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'sections_and_printindex'}{'contents'}[5];
+$result_trees{'sections_and_printindex'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'sections_and_printindex'}{'contents'}[3];
+$result_trees{'sections_and_printindex'}{'contents'}[6]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'sections_and_printindex'}{'contents'}[5];
$result_texis{'sections_and_printindex'} = '@node Top
@top for example
diff --git a/tp/t/results/converters_tests/setfilename_no_extension.pl
b/tp/t/results/converters_tests/setfilename_no_extension.pl
index 9b11cb3a7b..f323e9d209 100644
--- a/tp/t/results/converters_tests/setfilename_no_extension.pl
+++ b/tp/t/results/converters_tests/setfilename_no_extension.pl
@@ -53,23 +53,28 @@ $result_trees{'setfilename_no_extension'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -84,24 +89,27 @@ $result_trees{'setfilename_no_extension'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -119,24 +127,27 @@ $result_trees{'setfilename_no_extension'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/converters_tests/simplest_test_prefix.pl
b/tp/t/results/converters_tests/simplest_test_prefix.pl
index 04c4ddde5d..ca4b97d7df 100644
--- a/tp/t/results/converters_tests/simplest_test_prefix.pl
+++ b/tp/t/results/converters_tests/simplest_test_prefix.pl
@@ -31,24 +31,27 @@ $result_trees{'simplest_test_prefix'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index 757eed14a1..df88a4b27a 100644
--- a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -18,23 +18,28 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -49,24 +54,27 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -403,226 +411,231 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'A '
- },
- {
- 'cmdname' => 'sc',
'contents' => [
{
+ 'text' => 'A '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'text' => 'sc '
- },
- {
- 'cmdname' => '~',
'contents' => [
{
+ 'text' => 'sc '
+ },
+ {
+ 'cmdname' => '~',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'n'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'aa',
'contents' => [
{
- 'text' => 'n'
+ 'type' => 'brace_container'
}
],
- 'type' => 'following_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'aa',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'TeX',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
+ 'cmdname' => 'TeX',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
- 'source_info' => {
- 'line_nr' => 9
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- }
- },
- {
- 'text' => ' node '
- },
- {
- 'cmdname' => '"',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ },
{
+ 'text' => ' node '
+ },
+ {
+ 'cmdname' => '"',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '"',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => '"',
'contents' => [
{
- 'cmdname' => 'dotless',
'contents' => [
{
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
- 'source_info' => {
- 'line_nr' => 9
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '`',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '`',
'contents' => [
{
- 'cmdname' => '=',
'contents' => [
{
+ 'cmdname' => '=',
'contents' => [
{
- 'text' => 'E'
+ 'contents' => [
+ {
+ 'text' => 'E'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
- 'source_info' => {
- 'line_nr' => 9
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'l',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => ',',
- 'contents' => [
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'l',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => ',',
'contents' => [
{
- 'cmdname' => '\'',
'contents' => [
{
+ 'cmdname' => '\'',
'contents' => [
{
- 'text' => 'C'
+ 'contents' => [
+ {
+ 'text' => 'C'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
- 'source_info' => {
- 'line_nr' => 9
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'exclamdown',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ },
{
- 'type' => 'brace_container'
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'exclamdown',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
- 'source_info' => {
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' =>
'A-sc-_00f1-_00e5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
@@ -637,183 +650,186 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'A '
- },
- {
- 'cmdname' => 'sc',
'contents' => [
{
+ 'text' => 'A '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'text' => 'sc'
+ 'contents' => [
+ {
+ 'text' => 'sc'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 10
- }
- },
- {
- 'text' => ' node '
- },
- {
- 'cmdname' => '"',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 10
+ }
+ },
+ {
+ 'text' => ' node '
+ },
{
+ 'cmdname' => '"',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 10
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '"',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 10
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '"',
'contents' => [
{
- 'cmdname' => 'dotless',
'contents' => [
{
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 10
+ }
}
],
- 'source_info' => {
- 'line_nr' => 10
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 10
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '`',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 10
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '`',
'contents' => [
{
- 'cmdname' => '=',
'contents' => [
{
+ 'cmdname' => '=',
'contents' => [
{
- 'text' => 'E'
+ 'contents' => [
+ {
+ 'text' => 'E'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 10
+ }
}
],
- 'source_info' => {
- 'line_nr' => 10
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 10
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'l',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 10
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 10
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => ',',
- 'contents' => [
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'l',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 10
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => ',',
'contents' => [
{
- 'cmdname' => '\'',
'contents' => [
{
+ 'cmdname' => '\'',
'contents' => [
{
- 'text' => 'C'
+ 'contents' => [
+ {
+ 'text' => 'C'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 10
+ }
}
],
- 'source_info' => {
- 'line_nr' => 10
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 10
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'exclamdown',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 10
+ }
+ },
{
- 'type' => 'brace_container'
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'exclamdown',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 10
+ }
}
],
- 'source_info' => {
- 'line_nr' => 10
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1305,48 +1321,48 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
],
'type' => 'document_root'
};
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[13];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[13];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[5];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[7];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[8];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[9];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[10];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[11];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[12];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[13];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[5];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[7];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[8];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[9];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[10];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[11];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[12];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[13];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[13];
$result_texis{'some_at_commands_in_ref_nodes'} = '
@node Top
diff --git a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
index f2c22ad1f8..eb8b923afe 100644
--- a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -11,24 +11,27 @@ $result_trees{'spaces_in_empty_node_names'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -265,27 +268,30 @@ $result_trees{'spaces_in_empty_node_names'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => ' '
- },
- {
- 'cmdname' => ' '
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => ' '
+ },
+ {
+ 'cmdname' => ' '
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -302,41 +308,44 @@ $result_trees{'spaces_in_empty_node_names'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'verb',
'contents' => [
{
+ 'cmdname' => 'verb',
'contents' => [
{
- 'text' => ' ',
- 'type' => 'raw'
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'raw'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'info' => {
+ 'delimiter' => ':'
+ },
+ 'source_info' => {
+ 'line_nr' => 11
+ }
}
],
'info' => {
- 'delimiter' => ':'
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 11
- }
+ 'type' => 'line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -353,37 +362,40 @@ $result_trees{'spaces_in_empty_node_names'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'w',
'contents' => [
{
+ 'cmdname' => 'w',
'contents' => [
{
- 'text' => ' '
+ 'contents' => [
+ {
+ 'text' => ' '
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 13
+ }
}
],
- 'source_info' => {
- 'line_nr' => 13
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -545,14 +557,14 @@ $result_trees{'spaces_in_empty_node_names'} = {
],
'type' => 'document_root'
};
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'spaces_in_empty_node_names'} = '@node Top
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index df0ff9a959..09a5a894f7 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -11,24 +11,27 @@ $result_trees{'spaces_in_node_names'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -277,30 +280,33 @@ $result_trees{'spaces_in_node_names'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- },
- {
- 'cmdname' => ' '
- },
- {
- 'cmdname' => ' '
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ },
+ {
+ 'cmdname' => ' '
+ },
+ {
+ 'cmdname' => ' '
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -321,44 +327,47 @@ $result_trees{'spaces_in_node_names'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'b'
- },
- {
- 'cmdname' => 'verb',
'contents' => [
{
+ 'text' => 'b'
+ },
+ {
+ 'cmdname' => 'verb',
'contents' => [
{
- 'text' => ' ',
- 'type' => 'raw'
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'raw'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'info' => {
+ 'delimiter' => ':'
+ },
+ 'source_info' => {
+ 'line_nr' => 11
+ }
}
],
'info' => {
- 'delimiter' => ':'
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 11
- }
+ 'type' => 'line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -379,40 +388,43 @@ $result_trees{'spaces_in_node_names'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'c'
- },
- {
- 'cmdname' => 'w',
'contents' => [
{
+ 'text' => 'c'
+ },
+ {
+ 'cmdname' => 'w',
'contents' => [
{
- 'text' => ' '
+ 'contents' => [
+ {
+ 'text' => ' '
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 13
+ }
}
],
- 'source_info' => {
- 'line_nr' => 13
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -590,20 +602,20 @@ $result_trees{'spaces_in_node_names'} = {
],
'type' => 'document_root'
};
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_texis{'spaces_in_node_names'} = '@node Top
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 6379a7f503..34eabbbd9b 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -85,23 +85,28 @@ $result_trees{'test_deftypefnnewline'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -116,24 +121,27 @@ $result_trees{'test_deftypefnnewline'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -151,23 +159,28 @@ $result_trees{'test_deftypefnnewline'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -182,24 +195,27 @@ $result_trees{'test_deftypefnnewline'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -2993,20 +3009,20 @@ $result_trees{'test_deftypefnnewline'} = {
],
'type' => 'document_root'
};
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[12]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[20]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[3];
$result_texis{'test_deftypefnnewline'} = '@setfilename
test_deftypefnnewline.info
diff --git a/tp/t/results/converters_tests/test_formatting_customizations.pl
b/tp/t/results/converters_tests/test_formatting_customizations.pl
index 51f1d45711..51a148089a 100644
--- a/tp/t/results/converters_tests/test_formatting_customizations.pl
+++ b/tp/t/results/converters_tests/test_formatting_customizations.pl
@@ -16,23 +16,28 @@ $result_trees{'test_formatting_customizations'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -48,24 +53,27 @@ $result_trees{'test_formatting_customizations'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -84,23 +92,28 @@ $result_trees{'test_formatting_customizations'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapt'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapt'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapt'
@@ -116,24 +129,27 @@ $result_trees{'test_formatting_customizations'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 572f2c52c8..e9ac2d3994 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -806,23 +806,28 @@ $result_trees{'things_before_setfilename'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -838,24 +843,27 @@ $result_trees{'things_before_setfilename'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top section'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top section'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -874,23 +882,28 @@ $result_trees{'things_before_setfilename'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -906,24 +919,27 @@ $result_trees{'things_before_setfilename'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1039,8 +1055,8 @@
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'conten
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[3];
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_texis{'things_before_setfilename'} = '\\input texinfo
diff --git a/tp/t/results/converters_tests/top_in_ref.pl
b/tp/t/results/converters_tests/top_in_ref.pl
index 7c21d75842..31702ec6aa 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -11,24 +11,27 @@ $result_trees{'top_in_ref'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -49,24 +52,27 @@ $result_trees{'top_in_ref'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap refs node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap refs node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -2827,52 +2833,52 @@ $result_trees{'top_in_ref'} = {
],
'type' => 'document_root'
};
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[30]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[34]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[38]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[42]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[46]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[50]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[54]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[14]{'contents'}[0]{'contents'}[0];
$result_texis{'top_in_ref'} = '@node Top
diff --git
a/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
b/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
index b6ee64d298..816f7243d2 100644
--- a/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
+++ b/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
@@ -11,23 +11,28 @@ $result_trees{'various_itemize_command_as_argument'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'various_itemize_command_as_argument'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'various_itemize_command_as_argument'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'various_itemize_command_as_argument'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -983,13 +999,13 @@ $result_trees{'various_itemize_command_as_argument'} = {
],
'type' => 'document_root'
};
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[12]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'various_itemize_command_as_argument'} = '@node Top
@top top
diff --git
a/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
b/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
index f4c5957f9f..b969853c9c 100644
--- a/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
+++ b/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
@@ -11,23 +11,28 @@ $result_trees{'various_vtable_command_as_argument'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'various_vtable_command_as_argument'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'various_vtable_command_as_argument'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'various_vtable_command_as_argument'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1282,23 +1298,28 @@ $result_trees{'various_vtable_command_as_argument'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Indices'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Indices'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -1314,24 +1335,27 @@ $result_trees{'various_vtable_command_as_argument'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'appendix',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Print the index'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Print the index'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'appendix',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1385,28 +1409,28 @@ $result_trees{'various_vtable_command_as_argument'} = {
],
'type' => 'document_root'
};
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[12]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'various_vtable_command_as_argument'} = '@node Top
@top top
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 6a87614590..25b1a66ff7 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -18,23 +18,28 @@ $result_trees{'punctuation_in_line_commands'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'node! After punc'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'node! After punc'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -50,24 +55,27 @@ $result_trees{'punctuation_in_line_commands'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top! After punc'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top! After punc'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -769,14 +777,14 @@ $result_trees{'punctuation_in_line_commands'} = {
],
'type' => 'document_root'
};
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'float_section'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'}
=
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'}
=
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'element_node'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'float_section'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'shortcaption'}
=
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[2];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'extra'}{'caption'}
=
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'contents'}[2];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'extra'}{'float_section'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[12]{'extra'}{'element_node'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
$result_texis{'punctuation_in_line_commands'} = '
@node node! After punc
diff --git a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
index 8109db2a52..3d01283d18 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -11,23 +11,28 @@ $result_trees{'contain_plain_text_nestings'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'contain_plain_text_nestings'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'contain_plain_text_nestings'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -109,24 +122,27 @@ $result_trees{'contain_plain_text_nestings'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -666,12 +682,12 @@ $result_trees{'contain_plain_text_nestings'} = {
],
'type' => 'document_root'
};
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[7]{'extra'}{'element_node'}
= $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
$result_texis{'contain_plain_text_nestings'} = '@node Top
@top top
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl
b/tp/t/results/coverage_braces/footnote_no_node.pl
index db2f00dd74..e3ec1145b1 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -11,24 +11,27 @@ $result_trees{'footnote_no_node'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/coverage_braces/inforef_too_much_args.pl
b/tp/t/results/coverage_braces/inforef_too_much_args.pl
index 952397e617..130b24e310 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -11,24 +11,27 @@ $result_trees{'inforef_too_much_args'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -109,7 +112,7 @@ $result_trees{'inforef_too_much_args'} = {
],
'type' => 'document_root'
};
-$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'inforef_too_much_args'} = '@node chapter
diff --git a/tp/t/results/coverage_braces/seeentry_no_braces.pl
b/tp/t/results/coverage_braces/seeentry_no_braces.pl
index 05b2601931..6d7c8e7935 100644
--- a/tp/t/results/coverage_braces/seeentry_no_braces.pl
+++ b/tp/t/results/coverage_braces/seeentry_no_braces.pl
@@ -11,23 +11,28 @@ $result_trees{'seeentry_no_braces'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'seeentry_no_braces'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -77,23 +85,28 @@ $result_trees{'seeentry_no_braces'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -109,24 +122,27 @@ $result_trees{'seeentry_no_braces'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -225,7 +241,7 @@ $result_trees{'seeentry_no_braces'} = {
],
'type' => 'document_root'
};
-$result_trees{'seeentry_no_braces'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'seeentry_no_braces'}{'contents'}[3];
+$result_trees{'seeentry_no_braces'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'seeentry_no_braces'}{'contents'}[3];
$result_texis{'seeentry_no_braces'} = '@node Top
@top top
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index 12d0240175..3a1e80354f 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -592,23 +592,28 @@ $result_trees{'test_image'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -623,24 +628,27 @@ $result_trees{'test_image'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'source_marks' => [
{
@@ -2668,8 +2676,8 @@ $result_trees{'test_image'} = {
],
'type' => 'document_root'
};
-$result_trees{'test_image'}{'contents'}[2]{'contents'}[11]{'contents'}[6]{'extra'}{'float'}
= $result_trees{'test_image'}{'contents'}[2]{'contents'}[11];
-$result_trees{'test_image'}{'contents'}[2]{'contents'}[11]{'extra'}{'caption'}
= $result_trees{'test_image'}{'contents'}[2]{'contents'}[11]{'contents'}[6];
+$result_trees{'test_image'}{'contents'}[2]{'contents'}[12]{'contents'}[6]{'extra'}{'float'}
= $result_trees{'test_image'}{'contents'}[2]{'contents'}[12];
+$result_trees{'test_image'}{'contents'}[2]{'contents'}[12]{'extra'}{'caption'}
= $result_trees{'test_image'}{'contents'}[2]{'contents'}[12]{'contents'}[6];
$result_texis{'test_image'} = '@macro files-char
@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :} ,,,,.ext@@i--le@/.@.
a@@<"%@@@verb{: < & @ % " :}}
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
index d6941b8cd8..f41378d004 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -16,23 +16,28 @@ $result_trees{'two_footnotes_in_nodes'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'two_footnotes_in_nodes'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '2 footnotes in 2 nodes'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '2 footnotes in 2 nodes'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -291,23 +299,28 @@ $result_trees{'two_footnotes_in_nodes'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -322,24 +335,27 @@ $result_trees{'two_footnotes_in_nodes'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -467,7 +483,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
],
'type' => 'document_root'
};
-$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_texis{'two_footnotes_in_nodes'} = '@node Top
@top 2 footnotes in 2 nodes
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index 263ea56622..9dc2ca2035 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
@@ -50,23 +50,28 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -81,24 +86,27 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '2 footnotes in 2 nodes'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '2 footnotes in 2 nodes'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -325,23 +333,28 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -356,24 +369,27 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -501,7 +517,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
],
'type' => 'document_root'
};
-$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_texis{'two_footnotes_in_nodes_separate'} = '@footnotestyle separate
@node Top
diff --git
a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
index d862723922..cb59c08e45 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
@@ -50,23 +50,28 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'}
= {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -81,24 +86,27 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'}
= {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '2 footnotes in 2 nodes'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '2 footnotes in 2 nodes'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -325,23 +333,28 @@
$result_trees{'two_footnotes_in_nodes_separate_no_header'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -356,24 +369,27 @@
$result_trees{'two_footnotes_in_nodes_separate_no_header'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -501,7 +517,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'}
= {
],
'type' => 'document_root'
};
-$result_trees{'two_footnotes_in_nodes_separate_no_header'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'two_footnotes_in_nodes_separate_no_header'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_footnotes_in_nodes_separate_no_header'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'two_footnotes_in_nodes_separate_no_header'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_texis{'two_footnotes_in_nodes_separate_no_header'} = '@footnotestyle
separate
@node Top
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index cd9fbad5d6..a762390fb0 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -11,23 +11,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'all_commands_delimiters_printindex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -14238,53 +14246,53 @@ $result_trees{'all_commands_delimiters_printindex'} =
{
],
'type' => 'document_root'
};
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[24]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[26]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[28]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[32]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[34]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[36]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[38]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[40]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[42]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[44]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[46]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[48]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[50]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[54]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[56]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[58]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[60]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[62]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[64]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[66]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[68]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[70]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[72]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[74]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[76]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[78]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[80]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[82]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[84]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[86]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[88]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[90]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[92]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[94]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
$result_texis{'all_commands_delimiters_printindex'} = '@node Top
@node chap
diff --git a/tp/t/results/def/all_commands_printindex.pl
b/tp/t/results/def/all_commands_printindex.pl
index 15e90dcb97..aa7eeeefc0 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -11,23 +11,28 @@ $result_trees{'all_commands_printindex'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'all_commands_printindex'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -5112,33 +5120,33 @@ $result_trees{'all_commands_printindex'} = {
],
'type' => 'document_root'
};
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[24]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[26]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[28]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[32]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[34]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[36]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[38]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[40]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[42]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[44]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[46]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[48]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[50]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[54]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'all_commands_printindex'}{'contents'}[2];
$result_texis{'all_commands_printindex'} = '@node Top
@node chap
diff --git a/tp/t/results/def/omit_def_space.pl
b/tp/t/results/def/omit_def_space.pl
index 98d1a420b7..641469e1f5 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -11,24 +11,27 @@ $result_trees{'omit_def_space'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -49,24 +52,27 @@ $result_trees{'omit_def_space'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -400,8 +406,8 @@ $result_trees{'omit_def_space'} = {
],
'type' => 'document_root'
};
-$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'omit_def_space'}{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'omit_def_space'}{'contents'}[2];
$result_texis{'omit_def_space'} = '@node Top
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 8d4366b34d..45081b71a0 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -18,24 +18,27 @@ $result_trees{'ref_in_def'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'first'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'first'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -644,20 +647,20 @@ $result_trees{'ref_in_def'} = {
],
'type' => 'document_root'
};
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'ref_in_def'}{'contents'}[1];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'ref_in_def'}{'contents'}[1];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'ref_in_def'}{'contents'}[1];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'ref_in_def'}{'contents'}[1];
$result_texis{'ref_in_def'} = '
@node first
diff --git a/tp/t/results/def/space_in_def_for_index.pl
b/tp/t/results/def/space_in_def_for_index.pl
index 87df8151ea..5894c9e042 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -11,23 +11,28 @@ $result_trees{'space_in_def_for_index'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'space_in_def_for_index'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -408,8 +416,8 @@ $result_trees{'space_in_def_for_index'} = {
],
'type' => 'document_root'
};
-$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'space_in_def_for_index'}{'contents'}[2];
-$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'space_in_def_for_index'}{'contents'}[2];
+$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'space_in_def_for_index'}{'contents'}[2];
+$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'space_in_def_for_index'}{'contents'}[2];
$result_texis{'space_in_def_for_index'} = '@node Top
@node chap
diff --git a/tp/t/results/def/text_block_before_defline.pl
b/tp/t/results/def/text_block_before_defline.pl
index 7208f5a4ec..6fb7271840 100644
--- a/tp/t/results/def/text_block_before_defline.pl
+++ b/tp/t/results/def/text_block_before_defline.pl
@@ -16,23 +16,28 @@ $result_trees{'text_block_before_defline'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'text_block_before_defline'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -82,23 +90,28 @@ $result_trees{'text_block_before_defline'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapt'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapt'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapt'
@@ -113,24 +126,27 @@ $result_trees{'text_block_before_defline'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -527,7 +543,7 @@ $result_trees{'text_block_before_defline'} = {
],
'type' => 'document_root'
};
-$result_trees{'text_block_before_defline'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'text_block_before_defline'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'text_block_before_defline'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'text_block_before_defline'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
$result_texis{'text_block_before_defline'} = '@node Top
@top top
diff --git a/tp/t/results/docbook_tests/between_node_and_section.pl
b/tp/t/results/docbook_tests/between_node_and_section.pl
index 297dc74119..bd2e9e58d4 100644
--- a/tp/t/results/docbook_tests/between_node_and_section.pl
+++ b/tp/t/results/docbook_tests/between_node_and_section.pl
@@ -18,23 +18,28 @@ $result_trees{'between_node_and_section'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -49,24 +54,27 @@ $result_trees{'between_node_and_section'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -86,23 +94,28 @@ $result_trees{'between_node_and_section'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'sec1'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'sec1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'sec1'
@@ -117,24 +130,27 @@ $result_trees{'between_node_and_section'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'sec1'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'sec1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -154,24 +170,27 @@ $result_trees{'between_node_and_section'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'sec2'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'sec2'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'anchor',
'contents' => [
@@ -212,23 +231,28 @@ $result_trees{'between_node_and_section'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'sec2'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'sec2'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'section',
'extra' => {
'section_number' => '1.2'
},
diff --git a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
index f14f73a743..d8d77ff8d2 100644
--- a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -48,23 +48,28 @@ $result_trees{'multiple_documentlanguage'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -79,24 +84,27 @@ $result_trees{'multiple_documentlanguage'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -114,23 +122,28 @@ $result_trees{'multiple_documentlanguage'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -145,24 +158,27 @@ $result_trees{'multiple_documentlanguage'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chap no new language'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chap no new language'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -212,23 +228,28 @@ $result_trees{'multiple_documentlanguage'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter fr'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter fr'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter-fr'
@@ -243,24 +264,27 @@ $result_trees{'multiple_documentlanguage'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter fr'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter fr'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -310,23 +334,28 @@ $result_trees{'multiple_documentlanguage'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'subnode pt'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'subnode pt'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'subnode-pt'
@@ -341,24 +370,27 @@ $result_trees{'multiple_documentlanguage'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'section pt'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'section pt'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -408,23 +440,28 @@ $result_trees{'multiple_documentlanguage'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'subnode fr'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'subnode fr'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'subnode-fr'
@@ -439,24 +476,27 @@ $result_trees{'multiple_documentlanguage'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'section fr'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'section fr'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index 94222be7c0..9c5ed3b0ec 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -11,23 +11,28 @@ $result_trees{'special_docbook_unnumbered'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'special_docbook_unnumbered'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -332,23 +340,28 @@ $result_trees{'special_docbook_unnumbered'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Dedication'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Dedication'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Dedication'
@@ -363,24 +376,27 @@ $result_trees{'special_docbook_unnumbered'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'unnumbered',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a dedication'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a dedication'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'unnumbered',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -412,23 +428,28 @@ $result_trees{'special_docbook_unnumbered'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'preface'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'preface'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'preface'
@@ -443,24 +464,27 @@ $result_trees{'special_docbook_unnumbered'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'unnumbered',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'The Preface'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'The Preface'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'unnumbered',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -492,23 +516,28 @@ $result_trees{'special_docbook_unnumbered'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'colophon'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'colophon'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'colophon'
@@ -523,24 +552,27 @@ $result_trees{'special_docbook_unnumbered'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'unnumbered',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'A colophon'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'A colophon'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'unnumbered',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -572,23 +604,28 @@ $result_trees{'special_docbook_unnumbered'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'acknowledgements'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'acknowledgements'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'acknowledgements'
@@ -603,24 +640,27 @@ $result_trees{'special_docbook_unnumbered'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'A chapter Acnkowledgements'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'A chapter Acnkowledgements'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -651,10 +691,10 @@ $result_trees{'special_docbook_unnumbered'} = {
],
'type' => 'document_root'
};
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
$result_texis{'special_docbook_unnumbered'} = '@node Top
@top top
diff --git a/tp/t/results/epub_tests/chapter_before_top_epub.pl
b/tp/t/results/epub_tests/chapter_before_top_epub.pl
index 9a00c90af0..aac4e9816e 100644
--- a/tp/t/results/epub_tests/chapter_before_top_epub.pl
+++ b/tp/t/results/epub_tests/chapter_before_top_epub.pl
@@ -16,24 +16,27 @@ $result_trees{'chapter_before_top_epub'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -54,23 +57,28 @@ $result_trees{'chapter_before_top_epub'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -85,24 +93,27 @@ $result_trees{'chapter_before_top_epub'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -122,24 +133,27 @@ $result_trees{'chapter_before_top_epub'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'part'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'part'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'part',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -157,23 +171,28 @@ $result_trees{'chapter_before_top_epub'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'top',
'extra' => {
'associated_part' => {}
},
diff --git a/tp/t/results/epub_tests/section_part_epub.pl
b/tp/t/results/epub_tests/section_part_epub.pl
index def4ce7f50..28d02eb95d 100644
--- a/tp/t/results/epub_tests/section_part_epub.pl
+++ b/tp/t/results/epub_tests/section_part_epub.pl
@@ -16,23 +16,28 @@ $result_trees{'section_part_epub'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'section_part_epub'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'section'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'section'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -84,23 +92,28 @@ $result_trees{'section_part_epub'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'part',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'part'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'part'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'part',
'extra' => {},
'info' => {
'spaces_before_argument' => {
diff --git a/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
index f68e0f1766..f719bd0c1c 100644
--- a/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
+++ b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
@@ -16,23 +16,28 @@ $result_trees{'setfilename_on_top_and_after_node_epub'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,48 +52,51 @@ $result_trees{'setfilename_on_top_and_after_node_epub'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'In top '
- },
- {
- 'args' => [
+ 'contents' => [
+ {
+ 'text' => 'In top '
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'very badly placed setfilename'
+ 'contents' => [
+ {
+ 'text' => 'very badly placed setfilename'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'text_arg' => 'very badly placed setfilename'
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 2
+ }
}
],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'very badly placed setfilename'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 2
- }
+ 'type' => 'line_arg'
}
],
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/float/anchor_in_caption.pl
b/tp/t/results/float/anchor_in_caption.pl
index 48acd114d6..d75425d8c8 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -16,23 +16,28 @@ $result_trees{'anchor_in_caption'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'anchor_in_caption'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -259,8 +267,8 @@ $result_trees{'anchor_in_caption'} = {
],
'type' => 'document_root'
};
-$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3];
-$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[4];
+$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[4]{'extra'}{'caption'}
=
$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2];
$result_texis{'anchor_in_caption'} = '@node Top
@node chap
diff --git a/tp/t/results/float/cindex_in_caption.pl
b/tp/t/results/float/cindex_in_caption.pl
index 1f6c6e9658..263476ca54 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -16,23 +16,28 @@ $result_trees{'cindex_in_caption'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'cindex_in_caption'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -319,9 +327,9 @@ $result_trees{'cindex_in_caption'} = {
],
'type' => 'document_root'
};
-$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'cindex_in_caption'}{'contents'}[2];
-$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3];
-$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'cindex_in_caption'}{'contents'}[2];
+$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[4];
+$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[4]{'extra'}{'caption'}
=
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2];
$result_texis{'cindex_in_caption'} = '@node Top
@node chap
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl
b/tp/t/results/float/comment_space_comand_in_float.pl
index 914f7ca8b2..2a3332f5db 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -16,23 +16,28 @@ $result_trees{'comment_space_comand_in_float'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'comment_space_comand_in_float'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index 24d63ea088..b5e33bf815 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -16,23 +16,28 @@ $result_trees{'complex_float'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'complex_float'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Test floats'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Test floats'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -2196,23 +2204,28 @@ $result_trees{'complex_float'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -2227,24 +2240,27 @@ $result_trees{'complex_float'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'A chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'A chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3336,28 +3352,28 @@ $result_trees{'complex_float'} = {
],
'type' => 'document_root'
};
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_float'}{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_float'}{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'extra'}{'float'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[20]{'extra'}{'float'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'}
= $result_trees{'complex_float'}{'contents'}[2];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'shortcaption'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[20];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_float'}{'contents'}[3];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'float'}
= $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
= $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
= $result_trees{'complex_float'}{'contents'}[4];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_float'}{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_float'}{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'extra'}{'float'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[20]{'extra'}{'float'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'extra'}{'caption'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'extra'}{'float_section'}
= $result_trees{'complex_float'}{'contents'}[2];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'extra'}{'shortcaption'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[20];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_float'}{'contents'}[3];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
= $result_trees{'complex_float'}{'contents'}[4]{'contents'}[2];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'extra'}{'caption'}
= $result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'extra'}{'float_section'}
= $result_trees{'complex_float'}{'contents'}[4];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'complex_float'} = '@node Top
@top Test floats
diff --git a/tp/t/results/float/float_copying.pl
b/tp/t/results/float/float_copying.pl
index bd208d93e4..ec236bb879 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -500,23 +500,28 @@ $result_trees{'float_copying'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -531,24 +536,27 @@ $result_trees{'float_copying'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -688,23 +696,28 @@ $result_trees{'float_copying'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Copying and floats'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Copying and floats'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'isindex' => 1,
@@ -720,24 +733,27 @@ $result_trees{'float_copying'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'appendix',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Copying and floats'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Copying and floats'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'appendix',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -894,7 +910,7 @@ $result_trees{'float_copying'} = {
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'caption'}
=
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_texis{'float_copying'} = '@copying
diff --git a/tp/t/results/float/footnote_in_caption.pl
b/tp/t/results/float/footnote_in_caption.pl
index 190fc6db7e..99730bc824 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -16,23 +16,28 @@ $result_trees{'footnote_in_caption'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'footnote_in_caption'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -261,8 +269,8 @@ $result_trees{'footnote_in_caption'} = {
],
'type' => 'document_root'
};
-$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3];
-$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[4];
+$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[4]{'extra'}{'caption'}
=
$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2];
$result_texis{'footnote_in_caption'} = '@node Top
@node chap
diff --git a/tp/t/results/float/footnote_in_caption_and_error.pl
b/tp/t/results/float/footnote_in_caption_and_error.pl
index 7747fdb78f..ba143cda0e 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -16,23 +16,28 @@ $result_trees{'footnote_in_caption_and_error'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'footnote_in_caption_and_error'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -267,8 +275,8 @@ $result_trees{'footnote_in_caption_and_error'} = {
],
'type' => 'document_root'
};
-$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3];
-$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[4];
+$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[4]{'extra'}{'caption'}
=
$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[4]{'contents'}[2];
$result_texis{'footnote_in_caption_and_error'} = '@node Top
@node chap
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl
b/tp/t/results/float/numbering_captions_listoffloats.pl
index d6558ee168..37f19cc654 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -16,23 +16,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Test floats'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Test floats'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -1453,23 +1461,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chapter'
@@ -1484,24 +1497,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'A chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'A chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -2432,23 +2448,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'section'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'section'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'section'
@@ -2463,24 +2484,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'A section'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'A section'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -2603,23 +2627,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Unnumbered'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Unnumbered'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Unnumbered'
@@ -2634,24 +2663,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'unnumbered',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Unnumbered'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Unnumbered'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'unnumbered',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3070,23 +3102,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Section within unnumbered'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Section within unnumbered'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Section-within-unnumbered'
@@ -3101,24 +3138,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'section',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Section within unnumbered'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Section within unnumbered'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'section',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3294,23 +3334,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter with unnumbsubsec'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter with unnumbsubsec'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Chapter-with-unnumbsubsec'
@@ -3325,24 +3370,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter with unnumbsubsec'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter with unnumbsubsec'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3613,23 +3661,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'unnumbered sec'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'unnumbered sec'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'unnumbered-sec'
@@ -3644,24 +3697,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'unnumberedsec',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'unnumbered sec'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'unnumbered sec'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'unnumberedsec',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3982,23 +4038,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Appendix for float'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Appendix for float'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Appendix-for-float'
@@ -4013,24 +4074,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'appendix',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Appendix for float'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Appendix for float'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'appendix',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -4208,23 +4272,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'list of floats'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'list of floats'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'list-of-floats'
@@ -4239,24 +4308,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'unnumbered',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'list of floats'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'list of floats'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'unnumbered',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -4776,108 +4848,108 @@ $result_trees{'numbering_captions_listoffloats'} = {
],
'type' => 'document_root'
};
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[9]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[12]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[2]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4];
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'contents'}[3]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'contents'}[5]{'extra'}{'float'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'extra'}{'caption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'extra'}{'float_section'}
= $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'extra'}{'shortcaption'}
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_texis{'numbering_captions_listoffloats'} = '@node Top
@top Test floats
diff --git a/tp/t/results/float/special_characters_in_float_type.pl
b/tp/t/results/float/special_characters_in_float_type.pl
index 4db0715fe9..1739a9a861 100644
--- a/tp/t/results/float/special_characters_in_float_type.pl
+++ b/tp/t/results/float/special_characters_in_float_type.pl
@@ -16,23 +16,28 @@ $result_trees{'special_characters_in_float_type'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'special_characters_in_float_type'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -82,23 +90,28 @@ $result_trees{'special_characters_in_float_type'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'special_characters_in_float_type'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -393,9 +409,9 @@ $result_trees{'special_characters_in_float_type'} = {
],
'type' => 'document_root'
};
-$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1];
-$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
=
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
= $result_trees{'special_characters_in_float_type'}{'contents'}[4];
+$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
=
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[2];
+$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[2]{'extra'}{'caption'}
=
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[2]{'contents'}[2];
+$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[2]{'extra'}{'float_section'}
= $result_trees{'special_characters_in_float_type'}{'contents'}[4];
$result_texis{'special_characters_in_float_type'} = '@node Top
@top top
diff --git a/tp/t/results/formats_encodings/accent.pl
b/tp/t/results/formats_encodings/accent.pl
index 8bf3f8a83d..e6310bd81f 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -16,23 +16,28 @@ $result_trees{'accent'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'first'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'first'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'first'
@@ -47,24 +52,27 @@ $result_trees{'accent'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
b/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
index dc7be39711..2eb9aae9b3 100644
--- a/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
+++ b/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
@@ -16,23 +16,28 @@ $result_trees{'accent_argument_non_ascii'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'accent_argument_non_ascii'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -82,23 +90,28 @@ $result_trees{'accent_argument_non_ascii'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'chap'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'chap'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'accent_argument_non_ascii'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 43bf3d9429..b51ba8ad82 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -16,23 +16,28 @@ $result_trees{'accent_enable_encoding'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'first'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'first'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'first'
@@ -47,24 +52,27 @@ $result_trees{'accent_enable_encoding'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/formats_encodings/accentenc.pl
b/tp/t/results/formats_encodings/accentenc.pl
index 9e1421d9bc..f94d2adc4b 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -54,23 +54,28 @@ $result_trees{'accentenc'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'first'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'first'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'first'
@@ -85,24 +90,27 @@ $result_trees{'accentenc'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index b3dcfbfb7a..066008a371 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -49,23 +49,28 @@ $result_trees{'accentenc_enable_encoding'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'first'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'first'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'first'
@@ -80,24 +85,27 @@ $result_trees{'accentenc_enable_encoding'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index 2a91645fad..ee610ad46e 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -16,23 +16,28 @@ $result_trees{'at_commands_in_refs'} = {
'type' => 'before_node_section'
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'top',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'top',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3624,35 +3632,40 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '-'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '{'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '}'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '-'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '{'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '}'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => '-_007b-_007d'
@@ -3667,36 +3680,39 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '-'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '{'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '}'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '-'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '{'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '}'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -3716,71 +3732,76 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => ' '
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => ' '
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '!'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '*'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '.'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => ':'
- },
- {
- 'text' => ' .'
- },
- {
- 'cmdname' => ':'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '?'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '@'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => ' '
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => ' '
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '!'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '*'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '.'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => ':'
+ },
+ {
+ 'text' => ' .'
+ },
+ {
+ 'cmdname' => ':'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '?'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '@'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => '-_0021-_002e-_002e-_003f-_0040'
@@ -3795,172 +3816,180 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
- {
- 'contents' => [
- {
- 'cmdname' => ' '
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => ' '
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '!'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '*'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '.'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => ':'
- },
- {
- 'text' => ' .'
- },
- {
- 'cmdname' => ':'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '?'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '@'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
'cmdname' => 'chapter',
'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'extra' => {
- 'section_number' => '2'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 38
- }
- },
- {
- 'args' => [
{
'contents' => [
{
- 'cmdname' => 'atchar',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 40
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'lbracechar',
- 'contents' => [
+ 'cmdname' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 40
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'rbracechar',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 40
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'backslashchar',
- 'contents' => [
+ 'cmdname' => ' '
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '!'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '*'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '.'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => ':'
+ },
+ {
+ 'text' => ' .'
+ },
+ {
+ 'cmdname' => ':'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '?'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
+ 'cmdname' => '@'
}
],
- 'source_info' => {
- 'line_nr' => 40
- }
- },
- {
- 'text' => ' '
- },
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {
+ 'section_number' => '2'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 38
+ }
+ },
+ {
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
+ 'contents' => [
{
- 'cmdname' => 'hashchar',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'atchar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 40
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'lbracechar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 40
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'rbracechar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 40
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'backslashchar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 40
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'hashchar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 40
+ }
}
],
- 'source_info' => {
- 'line_nr' => 40
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => '_0040-_007b-_007d-_005c-_0023'
@@ -3975,88 +4004,91 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'atchar',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 41
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'lbracechar',
- 'contents' => [
+ 'cmdname' => 'atchar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 41
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 41
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'rbracechar',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 41
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'backslashchar',
- 'contents' => [
+ 'cmdname' => 'lbracechar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 41
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 41
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'hashchar',
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'rbracechar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 41
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'backslashchar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 41
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
+ 'cmdname' => 'hashchar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 41
+ }
}
],
- 'source_info' => {
- 'line_nr' => 41
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -4076,115 +4108,120 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'LaTeX',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 43
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'TeX',
- 'contents' => [
+ 'cmdname' => 'LaTeX',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 43
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 43
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'bullet',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 43
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'comma',
- 'contents' => [
+ 'cmdname' => 'TeX',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 43
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 43
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'copyright',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 43
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'dots',
- 'contents' => [
+ 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 43
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 43
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'enddots',
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'comma',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 43
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'copyright',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 43
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'dots',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 43
+ }
+ },
{
- 'type' => 'brace_container'
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'enddots',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 43
+ }
}
],
- 'source_info' => {
- 'line_nr' => 43
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
@@ -4199,116 +4236,119 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'LaTeX',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 44
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'TeX',
- 'contents' => [
+ 'cmdname' => 'LaTeX',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 44
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 44
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'bullet',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 44
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'comma',
- 'contents' => [
+ 'cmdname' => 'TeX',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 44
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 44
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'copyright',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 44
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'dots',
- 'contents' => [
+ 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 44
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 44
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'enddots',
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'comma',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 44
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'copyright',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 44
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
+ 'cmdname' => 'dots',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 44
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'enddots',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 44
+ }
}
],
- 'source_info' => {
- 'line_nr' => 44
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -4328,101 +4368,106 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
- {
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
'contents' => [
{
- 'cmdname' => 'equiv',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 46
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'error',
- 'contents' => [
+ 'cmdname' => 'equiv',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 46
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 46
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'euro',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 46
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'exclamdown',
- 'contents' => [
+ 'cmdname' => 'error',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 46
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 46
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'expansion',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 46
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'minus',
- 'contents' => [
+ 'cmdname' => 'euro',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 46
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'exclamdown',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 46
+ }
+ },
{
- 'type' => 'brace_container'
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'expansion',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 46
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'minus',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 46
+ }
}
],
- 'source_info' => {
- 'line_nr' => 46
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
@@ -4437,102 +4482,105 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'equiv',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 47
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'error',
- 'contents' => [
+ 'cmdname' => 'equiv',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 47
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 47
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'euro',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 47
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'exclamdown',
- 'contents' => [
+ 'cmdname' => 'error',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 47
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 47
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'expansion',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 47
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'minus',
- 'contents' => [
+ 'cmdname' => 'euro',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 47
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'exclamdown',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 47
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
+ 'cmdname' => 'expansion',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 47
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'minus',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 47
+ }
}
],
- 'source_info' => {
- 'line_nr' => 47
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -4552,59 +4600,64 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'geq',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 49
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'leq',
- 'contents' => [
+ 'cmdname' => 'geq',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 49
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 49
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'arrow',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 49
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'cmdname' => 'leq',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 49
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'arrow',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 49
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => '_2265-_2264-_2192'
@@ -4619,60 +4672,63 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'geq',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 50
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'leq',
- 'contents' => [
+ 'cmdname' => 'geq',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 50
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 50
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'arrow',
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'leq',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 50
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
+ 'cmdname' => 'arrow',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 50
+ }
}
],
- 'source_info' => {
- 'line_nr' => 50
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -4692,115 +4748,120 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ordf',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 52
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ordm',
- 'contents' => [
+ 'cmdname' => 'ordf',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 52
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 52
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'point',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 52
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'pounds',
- 'contents' => [
+ 'cmdname' => 'ordm',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 52
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 52
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'print',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 52
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'questiondown',
- 'contents' => [
+ 'cmdname' => 'point',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 52
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 52
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'registeredsymbol',
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'pounds',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 52
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'print',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 52
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'questiondown',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 52
+ }
+ },
{
- 'type' => 'brace_container'
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'registeredsymbol',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 52
+ }
}
],
- 'source_info' => {
- 'line_nr' => 52
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
@@ -4815,116 +4876,119 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ordf',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 53
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ordm',
- 'contents' => [
+ 'cmdname' => 'ordf',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 53
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 53
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'point',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 53
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'pounds',
- 'contents' => [
+ 'cmdname' => 'ordm',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 53
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 53
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'print',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 53
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'questiondown',
- 'contents' => [
+ 'cmdname' => 'point',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 53
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 53
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'registeredsymbol',
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'pounds',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 53
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'print',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 53
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'questiondown',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 53
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
+ 'cmdname' => 'registeredsymbol',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 53
+ }
}
],
- 'source_info' => {
- 'line_nr' => 53
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -4944,87 +5008,92 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'result',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 55
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'textdegree',
- 'contents' => [
+ 'cmdname' => 'result',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 55
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 55
- }
- },
- {
- 'text' => ' a'
- },
- {
- 'cmdname' => 'tie',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 55
- }
- },
- {
- 'text' => 'b '
- },
- {
- 'cmdname' => 'today',
- 'contents' => [
+ 'cmdname' => 'textdegree',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 55
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 55
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'aa',
- 'contents' => [
+ 'text' => ' a'
+ },
+ {
+ 'cmdname' => 'tie',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 55
+ }
+ },
+ {
+ 'text' => 'b '
+ },
+ {
+ 'cmdname' => 'today',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 55
+ }
+ },
{
- 'type' => 'brace_container'
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'aa',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 55
+ }
}
],
- 'source_info' => {
- 'line_nr' => 55
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => '_21d2-_00b0-a-b-_00e5'
@@ -5039,88 +5108,91 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'result',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 56
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'textdegree',
- 'contents' => [
+ 'cmdname' => 'result',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 56
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 56
- }
- },
- {
- 'text' => ' a'
- },
- {
- 'cmdname' => 'tie',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 56
- }
- },
- {
- 'text' => 'b '
- },
- {
- 'cmdname' => 'today',
- 'contents' => [
+ 'cmdname' => 'textdegree',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 56
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 56
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'aa',
- 'contents' => [
+ 'text' => ' a'
+ },
+ {
+ 'cmdname' => 'tie',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 56
+ }
+ },
+ {
+ 'text' => 'b '
+ },
+ {
+ 'cmdname' => 'today',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 56
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
+ 'cmdname' => 'aa',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 56
+ }
}
],
- 'source_info' => {
- 'line_nr' => 56
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -5140,435 +5212,443 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'AA',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ae',
- 'contents' => [
+ 'cmdname' => 'AA',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'oe',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'AE',
- 'contents' => [
+ 'cmdname' => 'ae',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'OE',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'o',
- 'contents' => [
+ 'cmdname' => 'oe',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'O',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ss',
- 'contents' => [
+ 'cmdname' => 'AE',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'l',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'L',
- 'contents' => [
+ 'cmdname' => 'OE',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'DH',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'dh',
- 'contents' => [
+ 'cmdname' => 'o',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
{
- 'type' => 'brace_container'
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'O',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'ss',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'l',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'L',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'DH',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'dh',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'TH',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'th',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 58
+ }
}
],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'type' => 'argument'
+ }
+ ],
+ 'extra' => {
+ 'is_target' => 1,
+ 'normalized' =>
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 58
+ }
+ },
+ {
+ 'cmdname' => 'chapter',
+ 'contents' => [
+ {
+ 'contents' => [
{
- 'cmdname' => 'TH',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'th',
- 'contents' => [
+ 'cmdname' => 'AA',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'ae',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'oe',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'AE',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'OE',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'o',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 58
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'extra' => {
- 'is_target' => 1,
- 'normalized' =>
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 58
- }
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'cmdname' => 'AA',
- 'contents' => [
+ 'cmdname' => 'O',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ae',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'oe',
- 'contents' => [
+ 'cmdname' => 'ss',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'AE',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'OE',
- 'contents' => [
+ 'cmdname' => 'l',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'o',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'O',
- 'contents' => [
+ 'cmdname' => 'L',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ss',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'l',
- 'contents' => [
+ 'cmdname' => 'DH',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'L',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'DH',
- 'contents' => [
+ 'cmdname' => 'dh',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'dh',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'TH',
- 'contents' => [
+ 'cmdname' => 'TH',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
+ },
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 59
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'th',
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'type' => 'brace_container'
+ 'cmdname' => 'th',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 59
+ }
}
],
- 'source_info' => {
- 'line_nr' => 59
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -5588,239 +5668,244 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '"',
'contents' => [
{
+ 'cmdname' => '"',
'contents' => [
{
- 'text' => 'a'
- }
- ],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 61
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '~',
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 61
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => '~',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 61
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '^',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 61
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '^',
'contents' => [
{
- 'cmdname' => 'dotless',
'contents' => [
{
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 61
+ }
}
],
- 'source_info' => {
- 'line_nr' => 61
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 61
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '^',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 61
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 61
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '`',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 61
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => '`',
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 61
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '\'',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 61
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '\'',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 61
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => ',',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 61
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => ',',
'contents' => [
{
- 'text' => 'c'
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 61
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '=',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 61
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '=',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 61
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ringaccent',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 61
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'ringaccent',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 61
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'H',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 61
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'H',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 61
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ogonek',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 61
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'ogonek',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 61
+ }
}
],
- 'source_info' => {
- 'line_nr' => 61
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' =>
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
@@ -5835,240 +5920,243 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '"',
'contents' => [
{
+ 'cmdname' => '"',
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 62
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '~',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => '~',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 62
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '^',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => '^',
'contents' => [
{
- 'cmdname' => 'dotless',
'contents' => [
{
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 62
+ }
}
],
- 'source_info' => {
- 'line_nr' => 62
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 62
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '^',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 62
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '`',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => '`',
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 62
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '\'',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => '\'',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 62
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => ',',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => ',',
'contents' => [
{
- 'text' => 'c'
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 62
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => '=',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => '=',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 62
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ringaccent',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'ringaccent',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 62
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'H',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'H',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 62
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ogonek',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'ogonek',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 62
+ }
}
],
- 'source_info' => {
- 'line_nr' => 62
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -6088,150 +6176,155 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'node',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'dotaccent',
'contents' => [
{
+ 'cmdname' => 'dotaccent',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 64
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'u',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 64
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'u',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 64
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ubaraccent',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 64
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'ubaraccent',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 64
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'udotaccent',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 64
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'udotaccent',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 64
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'v',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 64
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'v',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 64
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'dotless',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 64
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'j'
+ 'contents' => [
+ {
+ 'text' => 'j'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 64
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'tieaccent',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 64
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'tieaccent',
'contents' => [
{
- 'text' => 'ee'
+ 'contents' => [
+ {
+ 'text' => 'ee'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 64
+ }
}
],
- 'source_info' => {
- 'line_nr' => 64
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'node',
'extra' => {
'is_target' => 1,
'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
@@ -6246,151 +6339,154 @@ $result_trees{'at_commands_in_refs'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'chapter',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'dotaccent',
'contents' => [
{
+ 'cmdname' => 'dotaccent',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 65
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'u',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 65
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'u',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 65
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'ubaraccent',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 65
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'ubaraccent',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 65
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'udotaccent',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 65
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'udotaccent',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
-