texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Structuring.pm (check_nodes_are_refe


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Structuring.pm (check_nodes_are_referenced) (set_menus_node_directions, complete_node_tree_with_menus, nodes_tree) (elements_directions), tp/Texinfo/Convert/Info.pm (format_node), tp/Texinfo/Convert/Plaintext.pm (process_footnotes), tp/Texinfo/Convert/TexinfoXML.pm (_convert): put node_* and menu_* directions in structure.
Date: Fri, 31 Dec 2021 17:38:17 -0500

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new ec7b2811c4 * tp/Texinfo/Structuring.pm (check_nodes_are_referenced) 
(set_menus_node_directions, complete_node_tree_with_menus, nodes_tree) 
(elements_directions), tp/Texinfo/Convert/Info.pm (format_node), 
tp/Texinfo/Convert/Plaintext.pm (process_footnotes), 
tp/Texinfo/Convert/TexinfoXML.pm (_convert): put node_* and menu_* directions 
in structure.
ec7b2811c4 is described below

commit ec7b2811c406ba3b3235efc533c7686df357886c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 31 23:38:04 2021 +0100

    * tp/Texinfo/Structuring.pm (check_nodes_are_referenced)
    (set_menus_node_directions, complete_node_tree_with_menus, nodes_tree)
    (elements_directions), tp/Texinfo/Convert/Info.pm (format_node),
    tp/Texinfo/Convert/Plaintext.pm (process_footnotes),
    tp/Texinfo/Convert/TexinfoXML.pm (_convert): put node_* and menu_*
    directions in structure.
---
 ChangeLog                                          |    9 +
 tp/Texinfo/Convert/Info.pm                         |    6 +-
 tp/Texinfo/Convert/Plaintext.pm                    |    2 +-
 tp/Texinfo/Convert/TexinfoXML.pm                   |    4 +-
 tp/Texinfo/Structuring.pm                          |  129 +-
 .../results/converters_tests/at_commands_in_raw.pl |    9 +-
 tp/t/results/converters_tests/complex_nestings.pl  |    9 +-
 .../results/converters_tests/footnote_no_number.pl |    9 +-
 .../footnote_no_number_separate.pl                 |    9 +-
 tp/t/results/converters_tests/image_formatting.pl  |    9 +-
 .../index_entry_in_preformatted.pl                 |    9 +-
 .../printindex_merged_indices_code_style.pl        |    9 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl |  152 +-
 tp/t/results/converters_tests/refs_formatting.pl   |   12 +-
 .../some_at_commands_in_ref_nodes.pl               |   86 +-
 .../converters_tests/spaces_in_empty_node_names.pl |   18 +-
 .../converters_tests/spaces_in_node_names.pl       |  154 +-
 .../converters_tests/test_deftypefnnewline.pl      |   55 +-
 .../converters_tests/things_before_setfilename.pl  |   12 +-
 tp/t/results/converters_tests/top_in_ref.pl        |   29 +-
 .../converters_tests/top_in_ref_keep_top.pl        |   29 +-
 .../coverage/punctuation_in_line_commands.pl       |   12 +-
 .../coverage_braces/inforef_too_much_args.pl       |    9 +-
 tp/t/results/coverage_braces/test_image.pl         |    9 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |   86 +-
 .../two_footnotes_in_nodes_separate.pl             |   86 +-
 tp/t/results/coverage_braces/verb_in_xref.pl       |    9 +-
 .../def/all_commands_delimiters_printindex.pl      |    9 +-
 tp/t/results/def/all_commands_printindex.pl        |    9 +-
 tp/t/results/def/ref_in_def.pl                     |    9 +-
 tp/t/results/def/space_in_def_for_index.pl         |    9 +-
 .../docbook_tests/multiple_documentlanguage.pl     |   93 +-
 .../docbook_tests/special_docbook_unnumbered.pl    |  258 ++-
 tp/t/results/float/anchor_in_caption.pl            |    9 +-
 tp/t/results/float/cindex_in_caption.pl            |    9 +-
 .../results/float/comment_space_comand_in_float.pl |    9 +-
 tp/t/results/float/complex_float.pl                |   86 +-
 tp/t/results/float/float_copying.pl                |   90 +-
 tp/t/results/float/footnote_in_caption.pl          |    9 +-
 .../results/float/footnote_in_caption_and_error.pl |    9 +-
 .../float/numbering_captions_listoffloats.pl       |  544 ++---
 tp/t/results/formats_encodings/accent.pl           |   12 +-
 .../formats_encodings/accent_enable_encoding.pl    |   12 +-
 tp/t/results/formats_encodings/accentenc.pl        |   12 +-
 .../formats_encodings/accentenc_enable_encoding.pl |   12 +-
 .../formats_encodings/at_commands_in_refs.pl       | 1444 +++++++------
 .../at_commands_in_refs_latin1.pl                  | 1444 +++++++------
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 1444 +++++++------
 .../char_latin1_latin1_in_refs.pl                  |  318 +--
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |  318 +--
 .../char_latin2_latin2_in_refs.pl                  |   86 +-
 .../formats_encodings/japanese_shift_jis.pl        |  152 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |  218 +-
 tp/t/results/formats_encodings/weird_accents.pl    |   12 +-
 .../weird_accents_disable_encoding.pl              |   12 +-
 tp/t/results/formatting/cond.pl                    |    9 +-
 .../results/formatting/cond_ifhtml_ifinfo_iftex.pl |    9 +-
 tp/t/results/formatting/cond_info.pl               |    9 +-
 .../formatting/cond_info_ifhtml_ifinfo_iftex.pl    |    9 +-
 .../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl      |    9 +-
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |    9 +-
 tp/t/results/formatting/cond_xml.pl                |    9 +-
 .../formatting/direntry_dircategory_info_split.pl  |   86 +-
 .../formatting/documentlanguage_set_option.pl      |   12 +-
 .../formatting/documentlanguage_set_option_info.pl |   12 +-
 .../formatting/documentlanguage_set_unknown.pl     |   12 +-
 tp/t/results/formatting/float_copying.pl           |   90 +-
 .../formatting/simplest_test_date_in_header.pl     |    9 +-
 tp/t/results/formatting/simplest_test_prefix.pl    |    9 +-
 .../formatting/simplest_test_prefix_info.pl        |    9 +-
 .../formatting/split_for_format_not_split.pl       |    9 +-
 tp/t/results/formatting/split_nocopying.pl         |   86 +-
 tp/t/results/formatting/split_nocopying_split.pl   |   86 +-
 tp/t/results/formatting/texi_bib_example.pl        |  152 +-
 tp/t/results/formatting/texi_cond.pl               |    9 +-
 tp/t/results/formatting/texi_glossary.pl           |   86 +-
 tp/t/results/heading/heading_in_copying.pl         |    9 +-
 tp/t/results/html_tests/check_htmlxref.pl          |  115 +-
 .../deftypefnnewline_for_copying_after.pl          |   12 +-
 .../deftypefnnewline_for_copying_before.pl         |   12 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |   12 +-
 .../html_tests/footnotestyle_separate_late.pl      |   90 +-
 tp/t/results/html_tests/html_in_copying.pl         |   12 +-
 .../results/html_tests/index_and_node_same_name.pl |    9 +-
 tp/t/results/html_tests/redirection_same_labels.pl |  437 ++--
 tp/t/results/html_tests/ref_in_preformatted.pl     |   60 +-
 tp/t/results/html_tests/simple_menu.pl             |   46 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |   86 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |   86 +-
 .../text_before_top_and_contents_after_title.pl    |   12 +-
 ...t_before_top_and_summarycontents_after_title.pl |   12 +-
 tp/t/results/html_tests/titles.pl                  |   12 +-
 tp/t/results/htmlxref/htmlxref.pl                  |  259 +--
 tp/t/results/htmlxref/htmlxref_nodes.pl            |  259 +--
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |  259 +--
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |  259 +--
 tp/t/results/htmlxref/htmlxref_only_split.pl       |  259 +--
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |  259 +--
 tp/t/results/include/cpp_lines.pl                  |    9 +-
 .../macro_and_commands_in_early_commands.pl        |   12 +-
 tp/t/results/include/macro_in_early_commands.pl    |   12 +-
 tp/t/results/include/value_expansion_in_include.pl |    9 +-
 tp/t/results/indices/complex_recursive_synindex.pl |    9 +-
 tp/t/results/indices/def_syn_indices.pl            |   57 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |    9 +-
 tp/t/results/indices/double_index_entry.pl         |   64 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |   57 +-
 tp/t/results/indices/double_syncodeindex.pl        |    9 +-
 tp/t/results/indices/empty_cindex_entry.pl         |    9 +-
 tp/t/results/indices/empty_index_entry.pl          |    9 +-
 tp/t/results/indices/empty_string_index_entry.pl   |    9 +-
 tp/t/results/indices/encoding_index_ascii.pl       |   12 +-
 .../encoding_index_ascii_enable_encoding.pl        |   12 +-
 tp/t/results/indices/encoding_index_latin1.pl      |   12 +-
 .../encoding_index_latin1_enable_encoding.pl       |   12 +-
 tp/t/results/indices/encoding_index_utf8.pl        |   12 +-
 .../indices/encoding_index_utf8_enable_encoding.pl |   12 +-
 tp/t/results/indices/explicit_sort_key.pl          |   12 +-
 tp/t/results/indices/ftable_vtable.pl              |    9 +-
 tp/t/results/indices/image_lines_count.pl          |    9 +-
 tp/t/results/indices/image_text_lines_count.pl     |    9 +-
 tp/t/results/indices/index_entries_locations.pl    |    9 +-
 .../indices/index_entry_before_first_node.pl       |  Bin 9505 -> 9572 bytes
 tp/t/results/indices/index_entry_before_node.pl    |  111 +-
 tp/t/results/indices/index_entry_in_footnote.pl    |    9 +-
 .../index_entry_in_footnote_different_node_end.pl  |   64 +-
 .../indices/index_entry_in_footnote_separate.pl    |   64 +-
 tp/t/results/indices/print_merged_index.pl         |    9 +-
 .../indices/printindex_index_entry_in_copying.pl   |   90 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |   86 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |   90 +-
 .../indices/printindex_with_space_before.pl        |  Bin 9074 -> 9141 bytes
 .../indices/same_index_entry_merged_indices.pl     |   12 +-
 tp/t/results/indices/seealso_duplicate.pl          |    9 +-
 tp/t/results/indices/seeentry.pl                   |   57 +-
 tp/t/results/indices/subentries.pl                 |   57 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   57 +-
 tp/t/results/indices/syncode_index_print_both.pl   |   57 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |    9 +-
 tp/t/results/indices/transparent_sort_chars.pl     |   12 +-
 tp/t/results/indices/w_lines_count.pl              |   12 +-
 tp/t/results/info_tests/anchor_and_spaces.pl       |   12 +-
 tp/t/results/info_tests/anchor_in_command.pl       |    9 +-
 tp/t/results/info_tests/before_node_and_section.pl |   90 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |    9 +-
 tp/t/results/info_tests/def_in_copying.pl          |   12 +-
 .../direntry_dircategory_and_commands.pl           |   12 +-
 tp/t/results/info_tests/encoding_us_ascii.pl       |    9 +-
 tp/t/results/info_tests/error_in_footnote.pl       |    9 +-
 tp/t/results/info_tests/file_only_png.pl           |  Bin 6892 -> 6959 bytes
 tp/t/results/info_tests/float_long_captions.pl     |    9 +-
 tp/t/results/info_tests/image_and_punctuation.pl   |    9 +-
 .../info_tests/image_and_spaces_formatting.pl      |    9 +-
 tp/t/results/info_tests/image_extension.pl         |    9 +-
 tp/t/results/info_tests/image_in_paragraph.pl      |  Bin 6599 -> 6666 bytes
 tp/t/results/info_tests/image_not_found.pl         |    9 +-
 tp/t/results/info_tests/image_quotes.pl            |  Bin 5373 -> 5440 bytes
 tp/t/results/info_tests/index_entry_at_end_node.pl |  158 +-
 .../info_tests/invalid_node_name_no_warning.pl     |  154 +-
 .../info_tests/invalid_node_name_warning.pl        |  154 +-
 tp/t/results/info_tests/known_encoding.pl          |    9 +-
 .../multitable_anchor_and_index_entry.pl           |    9 +-
 .../info_tests/nested_footnotes_separate.pl        |    9 +-
 .../info_tests/nested_multitable_anchor_index.pl   |    9 +-
 tp/t/results/info_tests/no_top_node.pl             |    9 +-
 tp/t/results/info_tests/note_in_strong.pl          |    9 +-
 .../info_tests/note_in_strong_end_of_line.pl       |    9 +-
 tp/t/results/info_tests/novalidate_empty_refs.pl   |    9 +-
 .../info_tests/paragraphindent_and_preamble.pl     |   12 +-
 tp/t/results/info_tests/pxref_test.pl              |    9 +-
 tp/t/results/info_tests/ref_tests.pl               |    9 +-
 tp/t/results/info_tests/space_at_menu_end.pl       |   43 +-
 tp/t/results/info_tests/space_in_menu.pl           |   86 +-
 tp/t/results/info_tests/space_in_setfilename.pl    |    9 +-
 tp/t/results/info_tests/split_no_copying.pl        |   86 +-
 .../info_tests/split_test_before_first_node.pl     |   86 +-
 .../split_test_before_first_node_no_empty_line.pl  |   86 +-
 tp/t/results/info_tests/test_index.pl              |  158 +-
 tp/t/results/info_tests/text_before_node.pl        |   86 +-
 tp/t/results/info_tests/top_node_normalization.pl  |   31 +-
 tp/t/results/info_tests/unknown_encoding.pl        |    9 +-
 tp/t/results/info_tests/xref_test.pl               |    9 +-
 tp/t/results/invalid_nestings/footnote_in_ref.pl   |    9 +-
 tp/t/results/invalid_nestings/ignore_in_xref.pl    |    9 +-
 tp/t/results/invalid_nestings/in_table.pl          |    9 +-
 .../invalid_nestings/menu_in_style_command.pl      |   43 +-
 tp/t/results/invalid_nestings/node_in_copying.pl   |    9 +-
 .../invalid_nestings/node_in_copying_not_closed.pl |   12 +-
 .../invalid_nestings/node_on_index_entry_line.pl   |   64 +-
 tp/t/results/invalid_nestings/on_node_line.pl      |   38 +-
 tp/t/results/invalid_nestings/quotation_in_ref.pl  |    9 +-
 tp/t/results/invalid_nestings/ref_in_anchor.pl     |    9 +-
 tp/t/results/invalid_nestings/ref_in_ref.pl        |    9 +-
 .../style_not_closed_before_first_node.pl          |    9 +-
 .../style_not_closed_no_newline_root_commands.pl   |   86 +-
 .../style_not_closed_root_commands.pl              |   86 +-
 tp/t/results/invalid_nestings/verbatim_in_ref.pl   |    9 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |   55 +-
 .../itemize/inter_item_commands_in_itemize.pl      |   55 +-
 tp/t/results/languages/appendix_translated.pl      |   12 +-
 tp/t/results/languages/command_translated.pl       |   12 +-
 tp/t/results/languages/multiple.pl                 |    9 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |  318 +--
 .../languages/multiple_lang_chapters_latex.pl      |  318 +--
 .../languages/multiple_lang_chapters_texi2html.pl  |  318 +--
 tp/t/results/languages/simple.pl                   |    9 +-
 tp/t/results/languages/unknown_language.pl         |   12 +-
 tp/t/results/languages/unknown_region.pl           |    9 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |   61 +-
 tp/t/results/latex_tests/custom_headings.pl        |   55 +-
 tp/t/results/latex_tests/float_and_refs.pl         |   55 +-
 tp/t/results/latex_tests/fonttextsize.pl           |   55 +-
 tp/t/results/latex_tests/indices.pl                |   57 +-
 tp/t/results/latex_tests/pagesizes.pl              |   55 +-
 tp/t/results/latex_tests/pagetype.pl               |   55 +-
 tp/t/results/latex_tests/shorttitlepage.pl         |   55 +-
 tp/t/results/latex_tests/titlepage_classical.pl    |   55 +-
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |   55 +-
 tp/t/results/latex_tests/titlepage_long_title.pl   |   55 +-
 tp/t/results/latex_tests/titlepage_no_author.pl    |   55 +-
 tp/t/results/latex_tests/titlepage_no_title.pl     |   55 +-
 .../titlepage_with_commands_classical.pl           |   55 +-
 tp/t/results/layout/navigation.pl                  |  238 ++-
 tp/t/results/layout/navigation_chapter.pl          |  238 ++-
 .../results/layout/navigation_chapter_no_header.pl |  238 ++-
 .../navigation_chapter_no_header_vertical.pl       |  238 ++-
 tp/t/results/layout/navigation_chapter_vertical.pl |  238 ++-
 tp/t/results/layout/navigation_no_header.pl        |  238 ++-
 .../layout/navigation_no_header_vertical.pl        |  238 ++-
 tp/t/results/layout/navigation_node.pl             |  238 ++-
 tp/t/results/layout/navigation_node_no_header.pl   |  238 ++-
 .../layout/navigation_node_no_header_vertical.pl   |  238 ++-
 tp/t/results/layout/navigation_node_vertical.pl    |  238 ++-
 tp/t/results/layout/navigation_section.pl          |  238 ++-
 .../results/layout/navigation_section_no_header.pl |  238 ++-
 .../navigation_section_no_header_vertical.pl       |  238 ++-
 tp/t/results/layout/navigation_section_vertical.pl |  238 ++-
 tp/t/results/layout/navigation_vertical.pl         |  238 ++-
 tp/t/results/layout/no_monolithic.pl               |   90 +-
 tp/t/results/macro/backslash_in_arg.pl             |    9 +-
 tp/t/results/macro/macro_in_index_commands.pl      |    9 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |   86 +-
 .../menu/block_commands_in_menu_description.pl     |   46 +-
 tp/t/results/menu/comment_on_menu_line.pl          |   63 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        |  366 ++--
 tp/t/results/menu/detailmenu_unknown_node.pl       |    9 +-
 .../menu/direntry_dircategory_after_first_node.pl  |   12 +-
 tp/t/results/menu/empty_menu_entry_name.pl         |   46 +-
 tp/t/results/menu/entry_after_detailmenu.pl        |  107 +-
 tp/t/results/menu/example_in_menu_description.pl   |   46 +-
 tp/t/results/menu/formats_in_menu.pl               |   43 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |   46 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |   47 +-
 tp/t/results/menu/menu_in_deffn.pl                 |    9 +-
 tp/t/results/menu/menu_in_example.pl               |    9 +-
 tp/t/results/menu/menu_node_unterminated.pl        |    9 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |   55 +-
 tp/t/results/menu/menu_title_before_entries.pl     |   60 +-
 tp/t/results/menu/multiple_menus.pl                |   47 +-
 tp/t/results/menu/no_colon_in_menu.pl              |    9 +-
 tp/t/results/menu/reference_to_external_manual.pl  |   43 +-
 tp/t/results/menu/sc_in_menu.pl                    |   60 +-
 tp/t/results/menu/submenu_in_example.pl            |    9 +-
 tp/t/results/menu/verb_in_menu_description.pl      |   46 +-
 .../codequoteundirected_codequotebacktick.pl       |   12 +-
 .../misc_commands/comment_space_command_on_line.pl |   12 +-
 tp/t/results/misc_commands/ref_in_center.pl        |    9 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |    9 +-
 .../misc_commands/text_before_line_command.pl      |   12 +-
 tp/t/results/morecoverage/formatting_fr.pl         |  182 +-
 tp/t/results/morecoverage/texi_formatting.pl       |  182 +-
 tp/t/results/moreindices/double_index_entry.pl     |   64 +-
 tp/t/results/moreindices/index_split.pl            |  587 +++---
 tp/t/results/moreindices/index_split_nodes.pl      |  587 +++---
 tp/t/results/moreindices/nodes_before_top.pl       |  305 +--
 .../nodes_before_top_and_sections_monolithic.pl    |  373 ++--
 .../moreindices/nodes_before_top_no_nodes.pl       |  305 +--
 tp/t/results/moreindices/nodes_before_top_nodes.pl |  305 +--
 tp/t/results/moreindices/split_chapter_index.pl    |  242 ++-
 tp/t/results/moresectioning/equivalent_nodes.pl    |   63 +-
 .../moresectioning/equivalent_nodes_no_node.pl     |   63 +-
 .../moresectioning/more_sections_than_nodes.pl     |  310 +--
 tp/t/results/moresectioning/node_footnote_end.pl   |  264 +--
 .../moresectioning/node_footnote_separated.pl      |  264 +--
 .../moresectioning/node_footnote_use_node.pl       |  264 +--
 .../nodes_after_top_before_chapter.pl              |  130 +-
 ...s_after_top_before_chapter_use_nodes_chapter.pl |  130 +-
 .../nodes_after_top_before_section.pl              |  130 +-
 .../nodes_after_top_before_section_use_nodes.pl    |  130 +-
 ...s_after_top_before_section_use_nodes_chapter.pl |  130 +-
 tp/t/results/moresectioning/sectioning_frames.pl   |  770 +++----
 .../results/moresectioning/top_node_up_explicit.pl |  128 +-
 .../results/moresectioning/top_node_up_implicit.pl |   86 +-
 .../moresectioning/two_footnotes_in_nodes.pl       |   86 +-
 .../two_footnotes_in_nodes_separated.pl            |   86 +-
 tp/t/results/plaintext_tests/all_spaces.pl         |    9 +-
 .../plaintext_tests/chinese_mixed_with_en.pl       |    9 +-
 tp/t/results/plaintext_tests/japanese_utf8.pl      |  152 +-
 .../plaintext_tests/line_passed_and_formats.pl     |   47 +-
 tp/t/results/plaintext_tests/non_break_spaces.pl   |    9 +-
 tp/t/results/plaintext_tests/quote_node_names.pl   |  263 +--
 tp/t/results/regions/anchor_in_copying.pl          |    9 +-
 .../regions/anchor_in_copying_in_footnote.pl       |    9 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |    9 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |    9 +-
 tp/t/results/regions/format_in_titlepage.pl        |    9 +-
 .../regions/format_in_titlepage_titlepage.pl       |    9 +-
 tp/t/results/regions/ref_in_copying.pl             |   86 +-
 tp/t/results/regions/today_in_copying.pl           |   12 +-
 tp/t/results/sectioning/a_comma_after_node.pl      |    9 +-
 tp/t/results/sectioning/anchor_in_footnote.pl      |   86 +-
 .../sectioning/anchor_in_footnote_separate.pl      |   86 +-
 tp/t/results/sectioning/anchor_zero.pl             |    9 +-
 tp/t/results/sectioning/at_commands_in_node.pl     |    9 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |   86 +-
 .../chapter_node_before_and_after_part.pl          |  104 +-
 .../sectioning/character_and_spaces_in_node.pl     |   90 +-
 .../sectioning/character_and_spaces_in_refs.pl     |  259 +--
 .../sectioning/character_and_spaces_in_refs_out.pl |  357 ++--
 tp/t/results/sectioning/complex.pl                 | 1160 ++++++-----
 tp/t/results/sectioning/complex_split_at_node.pl   | 1192 ++++++-----
 .../sectioning/contents_at_document_begin.pl       |   12 +-
 .../results/sectioning/contents_at_end_document.pl |   12 +-
 .../contents_at_end_document_after_node.pl         |   63 +-
 tp/t/results/sectioning/contents_in_document.pl    |   12 +-
 tp/t/results/sectioning/contents_no_section.pl     |    9 +-
 .../sectioning/contents_with_only_top_node.pl      |    9 +-
 .../results/sectioning/double_node_anchor_float.pl |   18 +-
 tp/t/results/sectioning/double_part.pl             |  130 +-
 tp/t/results/sectioning/double_top.pl              |   15 +-
 tp/t/results/sectioning/double_top_in_menu.pl      |   35 +-
 tp/t/results/sectioning/email_in_node.pl           |    9 +-
 tp/t/results/sectioning/empty_ref_arg.pl           |    9 +-
 tp/t/results/sectioning/empty_top_node_up.pl       |   63 +-
 tp/t/results/sectioning/equivalent_labels.pl       |  104 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |   56 +-
 .../results/sectioning/explicit_node_directions.pl |  159 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |  146 +-
 tp/t/results/sectioning/internal_top_node_up.pl    |   91 +-
 tp/t/results/sectioning/lone_Top_node.pl           |  107 +-
 tp/t/results/sectioning/loop_nodes.pl              |  185 +-
 tp/t/results/sectioning/lowered_subsubsection.pl   |  470 +++--
 tp/t/results/sectioning/menutextorder.pl           |  284 +--
 .../results/sectioning/more_sections_than_nodes.pl |  310 +--
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  256 +--
 tp/t/results/sectioning/next_no_prev_to_node.pl    |  103 +-
 tp/t/results/sectioning/no_menu.pl                 |  121 +-
 tp/t/results/sectioning/node_empty_direction.pl    |    9 +-
 tp/t/results/sectioning/node_line_arguments.pl     |   27 +-
 tp/t/results/sectioning/node_nested_parentheses.pl |   43 +-
 .../sectioning/node_part_chapter_after_chapter.pl  |  216 +-
 .../sectioning/node_part_chapter_after_top.pl      |  130 +-
 tp/t/results/sectioning/node_referenced_in_ref.pl  |   63 +-
 .../node_sectop_before_chapter_no_node.pl          |   12 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |   72 +-
 tp/t/results/sectioning/node_too_much_args.pl      |   22 +-
 .../node_up_direction_for_top_with_manual.pl       |   25 +-
 tp/t/results/sectioning/node_up_external_node.pl   |  134 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |  212 +-
 .../nodes_after_top_before_chapter_nodes.pl        |  182 +-
 .../nodes_after_top_before_chapter_not_split.pl    |  130 +-
 ...ore_chapter_not_split_no_use_node_directions.pl |  130 +-
 .../nodes_after_top_before_chapter_sections.pl     |  170 +-
 .../nodes_after_top_before_section_nodes.pl        |  182 +-
 .../nodes_after_top_before_section_sections.pl     |  170 +-
 tp/t/results/sectioning/nodes_before_after_top.pl  |   61 +-
 .../sectioning/nodes_before_after_top_xref.pl      |   61 +-
 tp/t/results/sectioning/nodes_before_top.pl        |  146 +-
 .../nodes_no_node_top_explicit_directions.pl       |   99 +-
 .../non_automatic_internal_top_node_up.pl          |   87 +-
 .../non_automatic_top_node_up_and_url.pl           |   87 +-
 .../sectioning/non_automatic_top_node_up_url.pl    |  136 +-
 tp/t/results/sectioning/novalidate.pl              |   14 +-
 .../one_node_explicit_directions_anchor.pl         |   23 +-
 tp/t/results/sectioning/one_subsection_and_node.pl |   12 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |  130 +-
 tp/t/results/sectioning/part_node_after_top.pl     |   87 +-
 tp/t/results/sectioning/part_node_before_top.pl    |   91 +-
 .../sectioning/part_node_chapter_after_top.pl      |  197 +-
 .../sectioning/part_node_chapter_appendix.pl       |  130 +-
 .../sectioning/part_node_chapter_node_appendix.pl  |  220 +-
 .../sectioning/part_node_node_part_appendix.pl     |  220 +-
 tp/t/results/sectioning/part_node_part_appendix.pl |  130 +-
 .../sectioning/part_node_part_node_appendix.pl     |  220 +-
 .../sectioning/placed_things_before_node.pl        |   12 +-
 .../sectioning/protected_node_parentheses.pl       |   63 +-
 tp/t/results/sectioning/raiselowersections.pl      |  394 ++--
 tp/t/results/sectioning/rec_nodes.pl               |  221 +-
 tp/t/results/sectioning/ref_to_top.pl              |   12 +-
 .../sectioning/section_before_after_top_node.pl    |   12 +-
 .../section_before_after_top_node_last_node.pl     |   32 +-
 tp/t/results/sectioning/section_before_top.pl      |   86 +-
 .../results/sectioning/section_below_unnumbered.pl |  164 +-
 .../sectioning/section_chapter_before_top_nodes.pl |  174 +-
 .../sectioning/section_in_unnumbered_info.pl       | 2202 +++++++++++---------
 .../sectioning/section_in_unnumbered_plaintext.pl  | 2202 +++++++++++---------
 .../results/sectioning/section_node_before_part.pl |   12 +-
 tp/t/results/sectioning/semi_auto.pl               |  252 ++-
 .../setfilename_on_top_and_after_node.pl           |   12 +-
 tp/t/results/sectioning/space_in_node.pl           |  156 +-
 .../results/sectioning/top_no_argument_and_node.pl |   12 +-
 .../sectioning/top_no_argument_and_top_node.pl     |   12 +-
 .../sectioning/top_node_no_menu_direction.pl       |   70 +-
 tp/t/results/sectioning/top_node_part_top.pl       |   15 +-
 tp/t/results/sectioning/top_node_up_url.pl         |   91 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |   29 +-
 .../sectioning/top_without_node_sections.pl        |   29 +-
 .../transliterated_split_equivalent_nodes.pl       |  230 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  246 ++-
 .../sectioning/two_nodes_between_chapters.pl       |  271 +--
 tp/t/results/sectioning/unknown_node_in_menu.pl    |    9 +-
 .../sectioning/unnumbered_before_node_top_top.pl   |   15 +-
 .../sectioning/unnumbered_before_top_node.pl       |    9 +-
 .../unnumbered_top_without_node_nodes.pl           |   38 +-
 .../unnumbered_top_without_node_sections.pl        |   38 +-
 tp/t/results/value/value_in_index_commands.pl      |    9 +-
 tp/t/results/value/value_in_misc_commands.pl       |   12 +-
 tp/t/results/value/value_in_node.pl                |  199 +-
 tp/t/results/value/value_node_directions.pl        |  119 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |   58 +-
 tp/t/results/xml_tests/image_inline_or_not.pl      |  100 +-
 tp/t/results/xml_tests/node_and_bye.pl             |    9 +-
 tp/t/results/xml_tests/node_no_section.pl          |    9 +-
 tp/t/results/xtable/block_commands_in_table.pl     |   12 +-
 .../results/xtable/inter_item_commands_in_table.pl |   55 +-
 425 files changed, 25797 insertions(+), 20173 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0d8469205f..c6683beaff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2021-12-31  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Structuring.pm (check_nodes_are_referenced)
+       (set_menus_node_directions, complete_node_tree_with_menus, nodes_tree)
+       (elements_directions), tp/Texinfo/Convert/Info.pm (format_node),
+       tp/Texinfo/Convert/Plaintext.pm (process_footnotes),
+       tp/Texinfo/Convert/TexinfoXML.pm (_convert): put node_* and menu_*
+       directions in structure.
+
 2021-12-31  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm
diff --git a/tp/Texinfo/Convert/Info.pm b/tp/Texinfo/Convert/Info.pm
index 277b5f8395..654448b0d3 100644
--- a/tp/Texinfo/Convert/Info.pm
+++ b/tp/Texinfo/Convert/Info.pm
@@ -455,9 +455,9 @@ sub format_node($$)
   }
   $self->{'count_context'}->[-1]->{'bytes'} += $byte_count;
   $result .= $pre_quote . $node_text . $post_quote;
-  foreach my $direction(@directions) {
-    if ($node->{'node_'.lc($direction)}) {
-      my $node_direction = $node->{'node_'.lc($direction)};
+  foreach my $direction (@directions) {
+    if ($node->{'structure'}->{'node_'.lc($direction)}) {
+      my $node_direction = $node->{'structure'}->{'node_'.lc($direction)};
       my $text = ",  $direction: ";
       $self->add_text_count($text);
       $result .= $text;
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index fc801f23c6..143c714c7d 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -851,7 +851,7 @@ sub process_footnotes($;$)
                                      {'text' => '-Footnotes'}];
       my $footnotes_node = {
         'cmdname' => 'node',
-        'node_up' => $element->{'extra'}->{'node'},
+        'structure' => {'node_up' => $element->{'extra'}->{'node'}},
         'extra' => {'node_content' => $node_contents }
       };
       $result .= $self->format_node($footnotes_node);
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 70665cb416..f30e522f6c 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -926,8 +926,8 @@ sub _convert($$;$)
           my $pending_empty_directions = '';
           foreach my $direction(@node_directions) {
             my $format_element = 'node'.lc($direction);
-            if ($element->{'node_'.lc($direction)}) {
-              my $node_direction = $element->{'node_'.lc($direction)};
+            if ($element->{'structure'}->{'node_'.lc($direction)}) {
+              my $node_direction = 
$element->{'structure'}->{'node_'.lc($direction)};
               my $node_name = '';
               my $attribute = [];
               if (! 
defined($element->{'extra'}->{'nodes_manuals'}->[$direction_index])) {
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 1cef22c260..9e1b656f07 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -418,12 +418,12 @@ sub check_nodes_are_referenced
   foreach my $node (@{$nodes_list}) {
     # gather referenced nodes based on node pointers
     foreach my $direction (@node_directions) {
-      if ($node->{'node_'.$direction}
-          and not $node->{'node_'.$direction}->{'extra'}->{'manual_content'}) {
-        $referenced_nodes{$node->{'node_'.$direction}} = 1;
+      if ($node->{'structure'}->{'node_'.$direction}
+          and not 
$node->{'structure'}->{'node_'.$direction}->{'extra'}->{'manual_content'}) {
+        $referenced_nodes{$node->{'structure'}->{'node_'.$direction}} = 1;
       }
     }
-    if ($node->{'menu_up_hash'}) {
+    if ($node->{'structure'}->{'menu_up_hash'}) {
       $referenced_nodes{$node} = 1;
     }
   }
@@ -503,10 +503,10 @@ sub set_menus_node_directions($$$$$$)
               }
               # this may happen more than once for a given node if the node 
               # is in more than one menu.  Therefore all the menu up node 
-              # are kept in $menu_node->{'menu_up_hash'}
+              # are kept in $menu_node->{'structure'}->{'menu_up_hash'}
               if ($menu_node) {
-                $menu_node->{'menu_up'} = $node;
-                
$menu_node->{'menu_up_hash'}->{$node->{'extra'}->{'normalized'}} = 1;
+                $menu_node->{'structure'}->{'menu_up'} = $node;
+                
$menu_node->{'structure'}->{'menu_up_hash'}->{$node->{'extra'}->{'normalized'}} 
= 1;
               }
             } else {
               $external_node = 1;
@@ -515,13 +515,13 @@ sub set_menus_node_directions($$$$$$)
             if ($menu_node) {
               if ($previous_node) {
                 if (!$external_node) {
-                  $menu_node->{'menu_prev'} = $previous_node;
+                  $menu_node->{'structure'}->{'menu_prev'} = $previous_node;
                 }
                 if (!$previous_node->{'extra'}->{'manual_content'}) {
-                  $previous_node->{'menu_next'} = $menu_node;
+                  $previous_node->{'structure'}->{'menu_next'} = $menu_node;
                 }
               } else {
-                $node->{'menu_child'} = $menu_node;
+                $node->{'structure'}->{'menu_child'} = $menu_node;
               }
               $previous_node = $menu_node;
             }
@@ -590,10 +590,10 @@ sub complete_node_tree_with_menus($$$$)
       if ($node->{'extra'}->{'normalized'} ne 'Top') {
         foreach my $direction (@node_directions) {
           # prev already defined for the node first Top node menu entry
-          if ($direction eq 'prev' and $node->{'node_'.$direction}
-              and $node->{'node_'.$direction}->{'extra'}
-              and $node->{'node_'.$direction}->{'extra'}->{'normalized'}
-              and $node->{'node_'.$direction}->{'extra'}->{'normalized'} eq 
'Top') {
+          if ($direction eq 'prev' and 
$node->{'structure'}->{'node_'.$direction}
+              and $node->{'structure'}->{'node_'.$direction}->{'extra'}
+              and 
$node->{'structure'}->{'node_'.$direction}->{'extra'}->{'normalized'}
+              and 
$node->{'structure'}->{'node_'.$direction}->{'extra'}->{'normalized'} eq 'Top') 
{
             next;
           }
           if ($node->{'extra'}->{'associated_section'}) {
@@ -612,7 +612,7 @@ sub complete_node_tree_with_menus($$$$)
           and 
$section->{'structure'}->{'section_up'}{'extra'}{'associated_node'}
           and 
$section->{'structure'}->{'section_up'}{'extra'}{'associated_node'}{'menus'}
           and 
@{$section->{'structure'}->{'section_up'}{'extra'}{'associated_node'}{'menus'}}
-                    and !$node->{'menu_'.$direction}) {
+                    and !$node->{'structure'}->{'menu_'.$direction}) {
                   $registrar->line_warn($configuration_informations, 
           sprintf(__("node %s for `%s' is `%s' in sectioning but not in menu"),
                   $direction,
@@ -626,37 +626,38 @@ sub complete_node_tree_with_menus($$$$)
           # no direction was found using sections, use menus.  This allows
           # using only automatic direction for manuals without sectioning
           # commands.
-          if (!$node->{'node_'.$direction}
-              and $node->{'menu_'.$direction}
-              and !$node->{'menu_'.$direction}->{'extra'}->{'manual_content'}) 
{
+          if (!$node->{'structure'}->{'node_'.$direction}
+              and $node->{'structure'}->{'menu_'.$direction}
+              and 
!$node->{'structure'}->{'menu_'.$direction}->{'extra'}->{'manual_content'}) {
             if 
($configuration_informations->get_conf('CHECK_NORMAL_MENU_STRUCTURE')
                   and $node->{'extra'}->{'associated_section'}) {
               $registrar->line_warn($configuration_informations,
           sprintf(__("node `%s' is %s for `%s' in menu but not in sectioning"),
-                node_extra_to_texi($node->{'menu_'.$direction}->{'extra'}),
+                
node_extra_to_texi($node->{'structure'}->{'menu_'.$direction}->{'extra'}),
                                    $direction,
                 node_extra_to_texi($node->{'extra'}),
                   ),
                 $node->{'line_nr'});
             }
-            $node->{'node_'.$direction} = $node->{'menu_'.$direction};
+            $node->{'structure'}->{'node_'.$direction}
+               = $node->{'structure'}->{'menu_'.$direction};
           }
         }
-      } elsif (not $node->{'node_next'}) {
+      } elsif (not $node->{'structure'}->{'node_next'}) {
         # use first menu entry if available as next for Top
-        if ($node->{'menu_child'}) {
-          $node->{'node_next'} = $node->{'menu_child'};
-          if (!$node->{'menu_child'}->{'extra'}->{'manual_content'}
-              and !$node->{'menu_child'}->{'node_prev'}) {
-            $node->{'menu_child'}->{'node_prev'} = $node;
+        if ($node->{'structure'}->{'menu_child'}) {
+          $node->{'structure'}->{'node_next'} = 
$node->{'structure'}->{'menu_child'};
+          if 
(!$node->{'structure'}->{'menu_child'}->{'extra'}->{'manual_content'}
+              and 
!$node->{'structure'}->{'menu_child'}->{'structure'}->{'node_prev'}) {
+            $node->{'structure'}->{'menu_child'}->{'structure'}->{'node_prev'} 
= $node;
           }
         } else {
           # use the first non top node as next for Top
           foreach my $first_non_top_node (@{$nodes_list}) {
             if ($first_non_top_node ne $node) {
-              $node->{'node_next'} = $first_non_top_node;
+              $node->{'structure'}->{'node_next'} = $first_non_top_node;
               if (scalar(@{$first_non_top_node->{'extra'}->{'nodes_manuals'}}) 
== 1) {
-                $first_non_top_node->{'node_prev'} = $node;
+                $first_non_top_node->{'structure'}->{'node_prev'} = $node;
               }
               last;
             }
@@ -668,18 +669,18 @@ sub complete_node_tree_with_menus($$$$)
     if ($node->{'extra'}->{'normalized'} ne 'Top') {
       foreach my $direction (@node_directions) {
         if 
($configuration_informations->get_conf('CHECK_NORMAL_MENU_STRUCTURE')
-            and $node->{'node_'.$direction}
-            and $node->{'menu_'.$direction}
-            and $node->{'menu_'.$direction}
-               ne $node->{'node_'.$direction}
-            and not 
$node->{'menu_'.$direction}->{'extra'}->{'manual_content'}) {
+            and $node->{'structure'}->{'node_'.$direction}
+            and $node->{'structure'}->{'menu_'.$direction}
+            and $node->{'structure'}->{'menu_'.$direction}
+               ne $node->{'structure'}->{'node_'.$direction}
+            and not 
$node->{'structure'}->{'menu_'.$direction}->{'extra'}->{'manual_content'}) {
           $registrar->line_warn($configuration_informations,
             sprintf(__("node %s pointer for `%s' is `%s' but %s is `%s' in 
menu"),
                   $direction,
                   node_extra_to_texi($node->{'extra'}),
-                  node_extra_to_texi($node->{'node_'.$direction}->{'extra'}),
+                  
node_extra_to_texi($node->{'structure'}->{'node_'.$direction}->{'extra'}),
                   $direction,
-                  node_extra_to_texi($node->{'menu_'.$direction}->{'extra'})),
+                  
node_extra_to_texi($node->{'structure'}->{'menu_'.$direction}->{'extra'})),
                  $node->{'line_nr'});
         }
       }
@@ -687,19 +688,19 @@ sub complete_node_tree_with_menus($$$$)
 
     # check for node up / menu up mismatch
     if ($configuration_informations->get_conf('CHECK_NORMAL_MENU_STRUCTURE')
-        and $node->{'node_up'}
+        and $node->{'structure'}->{'node_up'}
         # No check if node up is an external manual
-        and (!$node->{'node_up'}->{'extra'}->{'manual_content'})
-        and (!$node->{'menu_up_hash'}
-          or 
!$node->{'menu_up_hash'}->{$node->{'node_up'}->{'extra'}->{'normalized'}})) {
+        and (!$node->{'structure'}->{'node_up'}->{'extra'}->{'manual_content'})
+        and (!$node->{'structure'}->{'menu_up_hash'}
+          or 
!$node->{'structure'}->{'menu_up_hash'}->{$node->{'structure'}->{'node_up'}->{'extra'}->{'normalized'}}))
 {
       # check if up node has a menu
-      if ($node->{'node_up'}->{'menus'} and @{$node->{'node_up'}->{'menus'}}) {
+      if ($node->{'structure'}->{'node_up'}->{'menus'} and 
@{$node->{'structure'}->{'node_up'}->{'menus'}}) {
         $registrar->line_warn($configuration_informations,
          sprintf(
            __("node `%s' lacks menu item for `%s' despite being its Up 
target"), 
-           node_extra_to_texi($node->{'node_up'}->{'extra'}), 
+           node_extra_to_texi($node->{'structure'}->{'node_up'}->{'extra'}), 
            node_extra_to_texi($node->{'extra'})),
-         $node->{'node_up'}->{'line_nr'});
+         $node->{'structure'}->{'node_up'}->{'line_nr'});
       }
       # FIXME check that the menu_up_hash is not empty (except for Top)?
       # FIXME check that node_up is not an external node (except for Top)?
@@ -732,9 +733,9 @@ sub nodes_tree($$$$$)
         foreach my $direction (@node_directions) {
           # prev already defined for the node first Top node menu entry
           if ($direction eq 'prev' and $node->{'node_'.$direction}
-              and $node->{'node_'.$direction}->{'extra'}
-              and $node->{'node_'.$direction}->{'extra'}->{'normalized'}
-              and $node->{'node_'.$direction}->{'extra'}->{'normalized'} eq 
'Top') {
+              and $node->{'structure'}->{'node_'.$direction}->{'extra'}
+              and 
$node->{'structure'}->{'node_'.$direction}->{'extra'}->{'normalized'}
+              and 
$node->{'structure'}->{'node_'.$direction}->{'extra'}->{'normalized'} eq 'Top') 
{
             next;
           }
           if ($node->{'extra'}->{'associated_section'}) {
@@ -748,7 +749,7 @@ sub nodes_tree($$$$$)
             my $direction_associated_node
               = _section_direction_associated_node($section, $direction);
             if ($direction_associated_node) {
-              $node->{'node_'.$direction} = $direction_associated_node;
+              $node->{'structure'}->{'node_'.$direction} = 
$direction_associated_node;
             }
           }
         }
@@ -760,9 +761,9 @@ sub nodes_tree($$$$$)
             and 
$node->{'extra'}->{'associated_section'}->{'structure'}->{'section_childs'}->[0]->{'extra'}->{'associated_node'})
 {
           my $top_node_section_child
             = 
$node->{'extra'}->{'associated_section'}->{'structure'}->{'section_childs'}->[0]->{'extra'}->{'associated_node'};
-          $node->{'node_next'} = $top_node_section_child;
+          $node->{'structure'}->{'node_next'} = $top_node_section_child;
           if (scalar(@{$top_node_section_child->{'extra'}->{'nodes_manuals'}}) 
== 1) {
-            $top_node_section_child->{'node_prev'} = $node;
+            $top_node_section_child->{'structure'}->{'node_prev'} = $node;
           }
         }
       }
@@ -774,12 +775,12 @@ sub nodes_tree($$$$$)
         next if (!defined($node_direction));
         # external node
         if ($node_direction->{'manual_content'}) {
-          $node->{'node_'.$direction} = { 'extra' => $node_direction };
+          $node->{'structure'}->{'node_'.$direction} = { 'extra' => 
$node_direction };
         } else {
           if ($labels->{$node_direction->{'normalized'}}) {
             my $node_target 
                = $labels->{$node_direction->{'normalized'}};
-            $node->{'node_'.$direction} = $node_target;
+            $node->{'structure'}->{'node_'.$direction} = $node_target;
 
             if (!$parser_informations->{'novalidate'}
                 and !_check_node_same_texinfo_code($node_target,
@@ -796,7 +797,7 @@ sub nodes_tree($$$$$)
             }
           } else {
             if ($parser_informations->{'novalidate'}) {
-              $node->{'node_'.$direction} = { 'extra' => $node_direction };
+              $node->{'structure'}->{'node_'.$direction} = { 'extra' => 
$node_direction };
             } else {
               $registrar->line_error($configuration_informations,
                    sprintf(__("%s reference to nonexistent `%s'"),
@@ -1028,35 +1029,36 @@ sub elements_directions($$$)
       my $node = $tree_unit->{'extra'}->{'node'};
       foreach my $direction(['NodeUp', 'node_up'], ['NodeNext', 'node_next'],
                             ['NodePrev', 'node_prev']) {
-        $directions->{$direction->[0]} = 
_label_target_element($node->{$direction->[1]})
-            if ($node->{$direction->[1]});
+        $directions->{$direction->[0]}
+           = _label_target_element($node->{'structure'}->{$direction->[1]})
+            if ($node->{'structure'}->{$direction->[1]});
       }
       # Now do NodeForward which is something like the following node.
       my $automatic_directions =
         (scalar(@{$node->{'extra'}->{'nodes_manuals'}}) == 1);
-      if ($node->{'menu_child'}) {
-        $directions->{'NodeForward'} = 
_label_target_element($node->{'menu_child'});
+      if ($node->{'structure'}->{'menu_child'}) {
+        $directions->{'NodeForward'} = 
_label_target_element($node->{'structure'}->{'menu_child'});
       } elsif ($automatic_directions and $node->{'associated_section'}
                and 
$node->{'associated_section'}->{'structure'}->{'section_childs'}
                and 
$node->{'associated_section'}->{'structure'}->{'section_childs'}->[0]) {
         $directions->{'NodeForward'}
           = 
$node->{'associated_section'}->{'structure'}->{'section_childs'}->[0]->{'parent'};
-      } elsif ($node->{'node_next'}) {
-        $directions->{'NodeForward'} = 
_label_target_element($node->{'node_next'});
+      } elsif ($node->{'structure'}->{'node_next'}) {
+        $directions->{'NodeForward'} = 
_label_target_element($node->{'structure'}->{'node_next'});
       } else {
-        my $up = $node->{'node_up'};
+        my $up = $node->{'structure'}->{'node_up'};
         my @up_list = ($node);
         # the condition with the up_list avoids infinite loops
         # the last condition stops when the Top node is reached.
         while (defined($up)
                and not (grep {$up eq $_} @up_list
                         or ($node_top and $up eq $node_top))) {
-          if (defined($up->{'node_next'})) {
-            $directions->{'NodeForward'} = 
_label_target_element($up->{'node_next'});
+          if (defined($up->{'structure'}->{'node_next'})) {
+            $directions->{'NodeForward'} = 
_label_target_element($up->{'structure'}->{'node_next'});
             last;
           }
           push @up_list, $up;
-          $up = $up->{'node_up'};
+          $up = $up->{'structure'}->{'node_up'};
         }
       }
       
@@ -1140,10 +1142,11 @@ sub elements_directions($$$)
     # Not done in the default case.
     if ($configuration_informations->get_conf('USE_UP_NODE_FOR_ELEMENT_UP')
         and !$directions->{'Up'} and $tree_unit->{'extra'}->{'node'}
-        and $tree_unit->{'extra'}->{'node'}->{'node_up'}
+        and $tree_unit->{'extra'}->{'node'}->{'structure'}->{'node_up'}
         and (!$node_top or ($tree_unit->{'extra'}->{'node'} ne $node_top))) {
       #print STDERR "Node for up: 
".root_or_external_element_cmd_texi($tree_unit)."\n";
-      my $up_node_element = 
_label_target_element($tree_unit->{'extra'}->{'node'}->{'node_up'});
+      my $up_node_element
+        = 
_label_target_element($tree_unit->{'extra'}->{'node'}->{'structure'}->{'node_up'});
       $directions->{'Up'} = $up_node_element if ($up_node_element);
     }
     if ($tree_unit->{'structure'}->{'directions'}) {
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 962fc3857c..fa481656af 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -802,7 +802,8 @@ $result_trees{'at_commands_in_raw'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -1008,7 +1009,8 @@ $result_nodes{'at_commands_in_raw'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'at_commands_in_raw'} = {
@@ -1017,7 +1019,8 @@ $result_menus{'at_commands_in_raw'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'at_commands_in_raw'} = [
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index cf0b2e9e24..349cde5c33 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1171,7 +1171,8 @@ $result_trees{'complex_nestings'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -1397,7 +1398,8 @@ $result_nodes{'complex_nestings'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'complex_nestings'} = {
@@ -1405,7 +1407,8 @@ $result_menus{'complex_nestings'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'complex_nestings'} = [];
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index c2b035ab1b..e4bc20cc16 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -150,7 +150,8 @@ $result_trees{'footnote_no_number'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -197,7 +198,8 @@ $result_nodes{'footnote_no_number'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'footnote_no_number'} = {
@@ -205,7 +207,8 @@ $result_menus{'footnote_no_number'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'footnote_no_number'} = [];
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 76d6efd0b3..fff2f0c42e 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -150,7 +150,8 @@ $result_trees{'footnote_no_number_separate'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -197,7 +198,8 @@ $result_nodes{'footnote_no_number_separate'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'footnote_no_number_separate'} = {
@@ -205,7 +207,8 @@ $result_menus{'footnote_no_number_separate'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'footnote_no_number_separate'} = [];
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 263e451dae..5711467538 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2096,7 +2096,8 @@ $result_trees{'image_formatting'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -2526,7 +2527,8 @@ $result_nodes{'image_formatting'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'image_formatting'} = {
@@ -2534,7 +2536,8 @@ $result_menus{'image_formatting'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'image_formatting'} = [];
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 0aff4c4ff7..e79ea26e9d 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -273,7 +273,8 @@ $result_trees{'index_entry_in_preformatted'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -344,7 +345,8 @@ $result_nodes{'index_entry_in_preformatted'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'index_entry_in_preformatted'} = {
@@ -352,7 +354,8 @@ $result_menus{'index_entry_in_preformatted'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'index_entry_in_preformatted'} = [];
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 6830248f56..effb22fc23 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
@@ -551,7 +551,8 @@ $result_trees{'printindex_merged_indices_code_style'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -679,7 +680,8 @@ $result_nodes{'printindex_merged_indices_code_style'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'printindex_merged_indices_code_style'} = {
@@ -688,7 +690,8 @@ $result_menus{'printindex_merged_indices_code_style'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'printindex_merged_indices_code_style'} = [];
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 2c1c25c5d1..74e80b316c 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -75,7 +75,8 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -140,7 +141,8 @@ $result_trees{'ref_in_sectioning'} = {
                     'line_nr' => 11,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -618,7 +620,8 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2177,7 +2180,8 @@ $result_sectioning{'ref_in_sectioning'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -2192,7 +2196,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                   'extra' => {
                     'normalized' => 'node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2212,7 +2217,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                   'extra' => {
                     'normalized' => 'chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2424,23 +2430,23 @@ $result_nodes{'ref_in_sectioning'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -2450,40 +2456,46 @@ $result_nodes{'ref_in_sectioning'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'chap',
+        'normalized' => 'node',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'chap',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'ref_in_sectioning'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'ref_in_sectioning'}{'menu_child'};
-$result_nodes{'ref_in_sectioning'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'ref_in_sectioning'};
-$result_nodes{'ref_in_sectioning'}{'menu_child'}{'node_prev'} = 
$result_nodes{'ref_in_sectioning'};
-$result_nodes{'ref_in_sectioning'}{'menu_child'}{'node_up'} = 
$result_nodes{'ref_in_sectioning'};
-$result_nodes{'ref_in_sectioning'}{'node_next'} = 
$result_nodes{'ref_in_sectioning'}{'menu_child'};
+$result_nodes{'ref_in_sectioning'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'ref_in_sectioning'}{'structure'}{'menu_child'};
+$result_nodes{'ref_in_sectioning'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'ref_in_sectioning'};
+$result_nodes{'ref_in_sectioning'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'ref_in_sectioning'};
+$result_nodes{'ref_in_sectioning'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'ref_in_sectioning'};
+$result_nodes{'ref_in_sectioning'}{'structure'}{'node_next'} = 
$result_nodes{'ref_in_sectioning'}{'structure'}{'menu_child'};
 
 $result_menus{'ref_in_sectioning'} = {
   'cmdname' => 'node',
@@ -2491,33 +2503,39 @@ $result_menus{'ref_in_sectioning'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chap',
+        'normalized' => 'node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'chap',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'ref_in_sectioning'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'ref_in_sectioning'}{'menu_child'};
-$result_menus{'ref_in_sectioning'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'ref_in_sectioning'};
-$result_menus{'ref_in_sectioning'}{'menu_child'}{'menu_up'} = 
$result_menus{'ref_in_sectioning'};
+$result_menus{'ref_in_sectioning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'ref_in_sectioning'}{'structure'}{'menu_child'};
+$result_menus{'ref_in_sectioning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'ref_in_sectioning'};
+$result_menus{'ref_in_sectioning'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'ref_in_sectioning'};
 
 $result_errors{'ref_in_sectioning'} = [
   {
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index daef23dbce..c58e7f1950 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -51,7 +51,8 @@ $result_trees{'refs_formatting'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4343,7 +4344,8 @@ $result_sectioning{'refs_formatting'} = {
             'extra' => {
               'normalized' => 'chapter',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -4373,7 +4375,8 @@ $result_nodes{'refs_formatting'} = {
     },
     'normalized' => 'chapter',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'refs_formatting'} = {
@@ -4381,7 +4384,8 @@ $result_menus{'refs_formatting'} = {
   'extra' => {
     'normalized' => 'chapter',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'refs_formatting'} = [
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 708a1b2b8a..58d002bf8b 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
@@ -58,7 +58,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -865,7 +866,8 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1708,7 +1710,8 @@ $result_sectioning{'some_at_commands_in_ref_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1723,7 +1726,8 @@ $result_sectioning{'some_at_commands_in_ref_nodes'} = {
                   'extra' => {
                     'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => '  '
               },
@@ -1762,25 +1766,6 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => '  '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1796,11 +1781,34 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => '  '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'some_at_commands_in_ref_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'some_at_commands_in_ref_nodes'};
-$result_nodes{'some_at_commands_in_ref_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'some_at_commands_in_ref_nodes'};
-$result_nodes{'some_at_commands_in_ref_nodes'}{'node_next'} = 
$result_nodes{'some_at_commands_in_ref_nodes'}{'menu_child'};
+$result_nodes{'some_at_commands_in_ref_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'some_at_commands_in_ref_nodes'};
+$result_nodes{'some_at_commands_in_ref_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'some_at_commands_in_ref_nodes'};
+$result_nodes{'some_at_commands_in_ref_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'some_at_commands_in_ref_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'some_at_commands_in_ref_nodes'} = {
   'cmdname' => 'node',
@@ -1808,19 +1816,23 @@ $result_menus{'some_at_commands_in_ref_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'some_at_commands_in_ref_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'some_at_commands_in_ref_nodes'};
+$result_menus{'some_at_commands_in_ref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'some_at_commands_in_ref_nodes'};
 
 $result_errors{'some_at_commands_in_ref_nodes'} = [];
 
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 796194a814..be7b202d89 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
@@ -315,7 +315,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -364,7 +365,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -430,7 +432,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -672,7 +675,8 @@ $result_trees{'spaces_in_empty_node_names'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -831,7 +835,8 @@ $result_nodes{'spaces_in_empty_node_names'} = {
         }
       }
     }
-  ]
+  ],
+  'structure' => {}
 };
 
 $result_menus{'spaces_in_empty_node_names'} = {
@@ -839,7 +844,8 @@ $result_menus{'spaces_in_empty_node_names'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'spaces_in_empty_node_names'} = [
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 5402fea745..20d6e841cd 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -330,7 +330,8 @@ $result_trees{'spaces_in_node_names'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -390,7 +391,8 @@ $result_trees{'spaces_in_node_names'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -466,7 +468,8 @@ $result_trees{'spaces_in_node_names'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -736,7 +739,8 @@ $result_trees{'spaces_in_node_names'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -909,33 +913,6 @@ $result_nodes{'spaces_in_node_names'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'a--',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'b-',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'c-',
-          'spaces_before_argument' => ' '
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -951,15 +928,50 @@ $result_nodes{'spaces_in_node_names'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'a--',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'b-',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'c-',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_next'};
-$result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'spaces_in_node_names'};
-$result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_next'}{'node_prev'} 
= $result_nodes{'spaces_in_node_names'}{'menu_child'};
-$result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'spaces_in_node_names'};
-$result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_prev'} = 
$result_nodes{'spaces_in_node_names'};
-$result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_up'} = 
$result_nodes{'spaces_in_node_names'};
-$result_nodes{'spaces_in_node_names'}{'node_next'} = 
$result_nodes{'spaces_in_node_names'}{'menu_child'};
+$result_nodes{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'spaces_in_node_names'};
+$result_nodes{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'spaces_in_node_names'}{'structure'}{'menu_child'};
+$result_nodes{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'spaces_in_node_names'};
+$result_nodes{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'spaces_in_node_names'};
+$result_nodes{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'spaces_in_node_names'};
+$result_nodes{'spaces_in_node_names'}{'structure'}{'node_next'} = 
$result_nodes{'spaces_in_node_names'}{'structure'}{'menu_child'};
 
 $result_menus{'spaces_in_node_names'} = {
   'cmdname' => 'node',
@@ -967,47 +979,55 @@ $result_menus{'spaces_in_node_names'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'a--',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'b-',
+        'normalized' => 'a--',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'c-',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'b-',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'c-',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'spaces_in_node_names'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'spaces_in_node_names'}{'menu_child'}{'menu_next'};
-$result_menus{'spaces_in_node_names'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'spaces_in_node_names'};
-$result_menus{'spaces_in_node_names'}{'menu_child'}{'menu_next'}{'menu_prev'} 
= $result_menus{'spaces_in_node_names'}{'menu_child'};
-$result_menus{'spaces_in_node_names'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'spaces_in_node_names'};
-$result_menus{'spaces_in_node_names'}{'menu_child'}{'menu_up'} = 
$result_menus{'spaces_in_node_names'};
+$result_menus{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'spaces_in_node_names'};
+$result_menus{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'spaces_in_node_names'}{'structure'}{'menu_child'};
+$result_menus{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'spaces_in_node_names'};
+$result_menus{'spaces_in_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'spaces_in_node_names'};
 
 $result_errors{'spaces_in_node_names'} = [
   {
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 87e1ab9a04..f46ab0af35 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -124,7 +124,8 @@ $result_trees{'test_deftypefnnewline'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -204,7 +205,8 @@ $result_trees{'test_deftypefnnewline'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3243,7 +3245,8 @@ $result_sectioning{'test_deftypefnnewline'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3258,7 +3261,8 @@ $result_sectioning{'test_deftypefnnewline'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3297,35 +3301,40 @@ $result_nodes{'test_deftypefnnewline'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'test_deftypefnnewline'}{'node_next'}{'node_prev'} = 
$result_nodes{'test_deftypefnnewline'};
-$result_nodes{'test_deftypefnnewline'}{'node_next'}{'node_up'} = 
$result_nodes{'test_deftypefnnewline'};
+$result_nodes{'test_deftypefnnewline'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'test_deftypefnnewline'};
+$result_nodes{'test_deftypefnnewline'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'test_deftypefnnewline'};
 
 $result_menus{'test_deftypefnnewline'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'test_deftypefnnewline'} = [];
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 45fef34efa..d40c2fd3fa 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -950,7 +950,8 @@ $result_trees{'things_before_setfilename'} = {
         'line_nr' => 46,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1370,7 +1371,8 @@ $result_sectioning{'things_before_setfilename'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1398,7 +1400,8 @@ $result_nodes{'things_before_setfilename'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'things_before_setfilename'} = {
@@ -1406,7 +1409,8 @@ $result_menus{'things_before_setfilename'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'things_before_setfilename'} = [
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index b727251b16..65a5f22a46 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -58,7 +58,8 @@ $result_trees{'top_in_ref'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3612,7 +3613,8 @@ $result_trees{'top_in_ref'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -4355,23 +4357,28 @@ $result_nodes{'top_in_ref'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'refs-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {}
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'refs-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {}
+      }
+    }
   }
 };
-$result_nodes{'top_in_ref'}{'node_next'}{'node_prev'} = 
$result_nodes{'top_in_ref'};
+$result_nodes{'top_in_ref'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'top_in_ref'};
 
 $result_menus{'top_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'top_in_ref'} = [
diff --git a/tp/t/results/converters_tests/top_in_ref_keep_top.pl 
b/tp/t/results/converters_tests/top_in_ref_keep_top.pl
index 2b466af4f6..631023c60a 100644
--- a/tp/t/results/converters_tests/top_in_ref_keep_top.pl
+++ b/tp/t/results/converters_tests/top_in_ref_keep_top.pl
@@ -58,7 +58,8 @@ $result_trees{'top_in_ref_keep_top'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3612,7 +3613,8 @@ $result_trees{'top_in_ref_keep_top'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -4355,23 +4357,28 @@ $result_nodes{'top_in_ref_keep_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'refs-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {}
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'refs-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {}
+      }
+    }
   }
 };
-$result_nodes{'top_in_ref_keep_top'}{'node_next'}{'node_prev'} = 
$result_nodes{'top_in_ref_keep_top'};
+$result_nodes{'top_in_ref_keep_top'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'top_in_ref_keep_top'};
 
 $result_menus{'top_in_ref_keep_top'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'top_in_ref_keep_top'} = [
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 9f1eaf7b7e..b55038b43e 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -59,7 +59,8 @@ $result_trees{'punctuation_in_line_commands'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1053,7 +1054,8 @@ $result_sectioning{'punctuation_in_line_commands'} = {
               'isindex' => 1,
               'normalized' => 'node_0021-After-punc',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1082,7 +1084,8 @@ $result_nodes{'punctuation_in_line_commands'} = {
     'isindex' => 1,
     'normalized' => 'node_0021-After-punc',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'punctuation_in_line_commands'} = {
@@ -1091,7 +1094,8 @@ $result_menus{'punctuation_in_line_commands'} = {
     'isindex' => 1,
     'normalized' => 'node_0021-After-punc',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'punctuation_in_line_commands'} = [];
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 5d7047aafe..0f06d2dcab 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -124,7 +124,8 @@ $result_trees{'inforef_too_much_args'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -162,7 +163,8 @@ $result_nodes{'inforef_too_much_args'} = {
   'extra' => {
     'normalized' => 'chapter',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'inforef_too_much_args'} = {
@@ -170,7 +172,8 @@ $result_menus{'inforef_too_much_args'} = {
   'extra' => {
     'normalized' => 'chapter',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'inforef_too_much_args'} = [
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 9c79b57821..f52db09c41 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -3038,7 +3038,8 @@ $result_trees{'test_image'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -3627,7 +3628,8 @@ $result_nodes{'test_image'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'test_image'} = {
@@ -3635,7 +3637,8 @@ $result_menus{'test_image'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'test_image'} = [
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 4111d0038a..a93b9a2f46 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -51,7 +51,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -379,7 +380,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -697,7 +699,8 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -712,7 +715,8 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -751,25 +755,6 @@ $result_nodes{'two_footnotes_in_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -785,11 +770,34 @@ $result_nodes{'two_footnotes_in_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'two_footnotes_in_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'two_footnotes_in_nodes'};
-$result_nodes{'two_footnotes_in_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'two_footnotes_in_nodes'};
-$result_nodes{'two_footnotes_in_nodes'}{'node_next'} = 
$result_nodes{'two_footnotes_in_nodes'}{'menu_child'};
+$result_nodes{'two_footnotes_in_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'two_footnotes_in_nodes'};
+$result_nodes{'two_footnotes_in_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'two_footnotes_in_nodes'};
+$result_nodes{'two_footnotes_in_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'two_footnotes_in_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'two_footnotes_in_nodes'} = {
   'cmdname' => 'node',
@@ -797,19 +805,23 @@ $result_menus{'two_footnotes_in_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'two_footnotes_in_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'two_footnotes_in_nodes'};
+$result_menus{'two_footnotes_in_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'two_footnotes_in_nodes'};
 
 $result_errors{'two_footnotes_in_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 78f5df7523..5160a988c0 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
@@ -83,7 +83,8 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -411,7 +412,8 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -733,7 +735,8 @@ $result_sectioning{'two_footnotes_in_nodes_separate'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -748,7 +751,8 @@ $result_sectioning{'two_footnotes_in_nodes_separate'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -787,25 +791,6 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -821,11 +806,34 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'two_footnotes_in_nodes_separate'}{'menu_child'}{'node_prev'} = 
$result_nodes{'two_footnotes_in_nodes_separate'};
-$result_nodes{'two_footnotes_in_nodes_separate'}{'menu_child'}{'node_up'} = 
$result_nodes{'two_footnotes_in_nodes_separate'};
-$result_nodes{'two_footnotes_in_nodes_separate'}{'node_next'} = 
$result_nodes{'two_footnotes_in_nodes_separate'}{'menu_child'};
+$result_nodes{'two_footnotes_in_nodes_separate'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'two_footnotes_in_nodes_separate'};
+$result_nodes{'two_footnotes_in_nodes_separate'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'two_footnotes_in_nodes_separate'};
+$result_nodes{'two_footnotes_in_nodes_separate'}{'structure'}{'node_next'} = 
$result_nodes{'two_footnotes_in_nodes_separate'}{'structure'}{'menu_child'};
 
 $result_menus{'two_footnotes_in_nodes_separate'} = {
   'cmdname' => 'node',
@@ -833,19 +841,23 @@ $result_menus{'two_footnotes_in_nodes_separate'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'two_footnotes_in_nodes_separate'}{'menu_child'}{'menu_up'} = 
$result_menus{'two_footnotes_in_nodes_separate'};
+$result_menus{'two_footnotes_in_nodes_separate'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'two_footnotes_in_nodes_separate'};
 
 $result_errors{'two_footnotes_in_nodes_separate'} = [];
 
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index 71998c807f..8d7051d702 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -153,7 +153,8 @@ $result_trees{'verb_in_xref'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -198,7 +199,8 @@ $result_nodes{'verb_in_xref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'verb_in_xref'} = {
@@ -206,7 +208,8 @@ $result_menus{'verb_in_xref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'verb_in_xref'} = [
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 22f7951fa4..77dd1f0952 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -13667,7 +13667,8 @@ $result_trees{'all_commands_delimiters_printindex'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -15779,7 +15780,8 @@ $result_nodes{'all_commands_delimiters_printindex'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'all_commands_delimiters_printindex'} = {
@@ -15788,7 +15790,8 @@ $result_menus{'all_commands_delimiters_printindex'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'all_commands_delimiters_printindex'} = [];
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index 863a66ccf4..aa6dc2c528 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -4750,7 +4750,8 @@ $result_trees{'all_commands_printindex'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -5677,7 +5678,8 @@ $result_nodes{'all_commands_printindex'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'all_commands_printindex'} = {
@@ -5686,7 +5688,8 @@ $result_menus{'all_commands_printindex'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'all_commands_printindex'} = [];
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index ed6e7e10ae..66951b9302 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -679,7 +679,8 @@ $result_trees{'ref_in_def'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -810,7 +811,8 @@ $result_nodes{'ref_in_def'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'ref_in_def'} = {
@@ -818,7 +820,8 @@ $result_menus{'ref_in_def'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'ref_in_def'} = [];
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 d9e1db662f..27db263019 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -393,7 +393,8 @@ $result_trees{'space_in_def_for_index'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -472,7 +473,8 @@ $result_nodes{'space_in_def_for_index'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'space_in_def_for_index'} = {
@@ -481,7 +483,8 @@ $result_menus{'space_in_def_for_index'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'space_in_def_for_index'} = [];
diff --git a/tp/t/results/docbook_tests/multiple_documentlanguage.pl 
b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
index 24d6e5be8c..c448dfb734 100644
--- a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -87,7 +87,8 @@ $result_trees{'multiple_documentlanguage'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -167,7 +168,8 @@ $result_trees{'multiple_documentlanguage'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -277,7 +279,8 @@ $result_trees{'multiple_documentlanguage'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -387,7 +390,8 @@ $result_trees{'multiple_documentlanguage'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -497,7 +501,8 @@ $result_trees{'multiple_documentlanguage'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -655,7 +660,8 @@ $result_sectioning{'multiple_documentlanguage'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -670,7 +676,8 @@ $result_sectioning{'multiple_documentlanguage'} = {
                   'extra' => {
                     'normalized' => 'chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -690,7 +697,8 @@ $result_sectioning{'multiple_documentlanguage'} = {
                   'extra' => {
                     'normalized' => 'chapter-fr',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -706,7 +714,8 @@ $result_sectioning{'multiple_documentlanguage'} = {
                         'extra' => {
                           'normalized' => 'subnode-pt',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -724,7 +733,8 @@ $result_sectioning{'multiple_documentlanguage'} = {
                         'extra' => {
                           'normalized' => 'subnode-fr',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -776,22 +786,7 @@ $result_nodes{'multiple_documentlanguage'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chap',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
@@ -802,30 +797,52 @@ $result_nodes{'multiple_documentlanguage'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'chapter-fr',
+        'normalized' => 'chap',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'chapter-fr',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'multiple_documentlanguage'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'multiple_documentlanguage'}{'node_next'};
-$result_nodes{'multiple_documentlanguage'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_documentlanguage'};
-$result_nodes{'multiple_documentlanguage'}{'node_next'}{'node_prev'} = 
$result_nodes{'multiple_documentlanguage'};
-$result_nodes{'multiple_documentlanguage'}{'node_next'}{'node_up'} = 
$result_nodes{'multiple_documentlanguage'};
+$result_nodes{'multiple_documentlanguage'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'multiple_documentlanguage'}{'structure'}{'node_next'};
+$result_nodes{'multiple_documentlanguage'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_documentlanguage'};
+$result_nodes{'multiple_documentlanguage'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'multiple_documentlanguage'};
+$result_nodes{'multiple_documentlanguage'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_documentlanguage'};
 
 $result_menus{'multiple_documentlanguage'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'multiple_documentlanguage'} = [];
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index 99e402c3e7..c6e1391ef9 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -51,7 +51,8 @@ $result_trees{'special_docbook_unnumbered'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -435,7 +436,8 @@ $result_trees{'special_docbook_unnumbered'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -532,7 +534,8 @@ $result_trees{'special_docbook_unnumbered'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -629,7 +632,8 @@ $result_trees{'special_docbook_unnumbered'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -726,7 +730,8 @@ $result_trees{'special_docbook_unnumbered'} = {
         'line_nr' => 28,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -968,7 +973,8 @@ $result_sectioning{'special_docbook_unnumbered'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -983,7 +989,8 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                   'extra' => {
                     'normalized' => 'Dedication',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1002,7 +1009,8 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                   'extra' => {
                     'normalized' => 'preface',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1022,7 +1030,8 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                   'extra' => {
                     'normalized' => 'colophon',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1042,7 +1051,8 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                   'extra' => {
                     'normalized' => 'acknowledgements',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1094,22 +1104,23 @@ $result_nodes{'special_docbook_unnumbered'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'Dedication',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1121,78 +1132,87 @@ $result_nodes{'special_docbook_unnumbered'} = {
             'level' => 1
           }
         },
-        'normalized' => 'preface',
+        'normalized' => 'Dedication',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'unnumbered',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1
-            }
-          },
-          'normalized' => 'colophon',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'chapter',
+              'cmdname' => 'unnumbered',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1
+                'level' => 1
               }
             },
-            'normalized' => 'acknowledgements',
+            'normalized' => 'preface',
             'spaces_before_argument' => ' '
           },
-          'node_prev' => {},
-          'node_up' => {}
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'unnumbered',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1
+                  }
+                },
+                'normalized' => 'colophon',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'chapter',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 1,
+                        'number' => 1
+                      }
+                    },
+                    'normalized' => 'acknowledgements',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'special_docbook_unnumbered'};
-$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'};
-$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'special_docbook_unnumbered'};
-$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'special_docbook_unnumbered'}{'menu_child'};
-$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'special_docbook_unnumbered'};
-$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_prev'} = 
$result_nodes{'special_docbook_unnumbered'};
-$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_up'} = 
$result_nodes{'special_docbook_unnumbered'};
-$result_nodes{'special_docbook_unnumbered'}{'node_next'} = 
$result_nodes{'special_docbook_unnumbered'}{'menu_child'};
+$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'special_docbook_unnumbered'};
+$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'special_docbook_unnumbered'};
+$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'};
+$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'special_docbook_unnumbered'};
+$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'special_docbook_unnumbered'};
+$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'special_docbook_unnumbered'};
+$result_nodes{'special_docbook_unnumbered'}{'structure'}{'node_next'} = 
$result_nodes{'special_docbook_unnumbered'}{'structure'}{'menu_child'};
 
 $result_menus{'special_docbook_unnumbered'} = {
   'cmdname' => 'node',
@@ -1200,61 +1220,71 @@ $result_menus{'special_docbook_unnumbered'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Dedication',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'preface',
+        'normalized' => 'Dedication',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'colophon',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'acknowledgements',
+            'normalized' => 'preface',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'colophon',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'acknowledgements',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'special_docbook_unnumbered'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'special_docbook_unnumbered'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'special_docbook_unnumbered'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'special_docbook_unnumbered'};
-$result_menus{'special_docbook_unnumbered'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'special_docbook_unnumbered'}{'menu_child'}{'menu_next'};
-$result_menus{'special_docbook_unnumbered'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'special_docbook_unnumbered'};
-$result_menus{'special_docbook_unnumbered'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'special_docbook_unnumbered'}{'menu_child'};
-$result_menus{'special_docbook_unnumbered'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'special_docbook_unnumbered'};
-$result_menus{'special_docbook_unnumbered'}{'menu_child'}{'menu_up'} = 
$result_menus{'special_docbook_unnumbered'};
+$result_menus{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'special_docbook_unnumbered'};
+$result_menus{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'special_docbook_unnumbered'};
+$result_menus{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'special_docbook_unnumbered'}{'structure'}{'menu_child'};
+$result_menus{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'special_docbook_unnumbered'};
+$result_menus{'special_docbook_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'special_docbook_unnumbered'};
 
 $result_errors{'special_docbook_unnumbered'} = [];
 
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index 14e5df84f6..d8d3d3763a 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -259,7 +259,8 @@ $result_trees{'anchor_in_caption'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -324,7 +325,8 @@ $result_nodes{'anchor_in_caption'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'anchor_in_caption'} = {
@@ -332,7 +334,8 @@ $result_menus{'anchor_in_caption'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'anchor_in_caption'} = [];
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 716fb8cf80..ea6c4909fb 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -317,7 +317,8 @@ $result_trees{'cindex_in_caption'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -398,7 +399,8 @@ $result_nodes{'cindex_in_caption'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'cindex_in_caption'} = {
@@ -407,7 +409,8 @@ $result_menus{'cindex_in_caption'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'cindex_in_caption'} = [];
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 55da6b9ef4..190ba5d040 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -241,7 +241,8 @@ $result_trees{'comment_space_comand_in_float'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -303,7 +304,8 @@ $result_nodes{'comment_space_comand_in_float'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'comment_space_comand_in_float'} = {
@@ -311,7 +313,8 @@ $result_menus{'comment_space_comand_in_float'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'comment_space_comand_in_float'} = [];
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 119aa12eab..049e97528c 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -51,7 +51,8 @@ $result_trees{'complex_float'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2536,7 +2537,8 @@ $result_trees{'complex_float'} = {
         'line_nr' => 91,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4582,7 +4584,8 @@ $result_sectioning{'complex_float'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -4597,7 +4600,8 @@ $result_sectioning{'complex_float'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -4636,25 +4640,6 @@ $result_nodes{'complex_float'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -4670,11 +4655,34 @@ $result_nodes{'complex_float'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'complex_float'}{'menu_child'}{'node_prev'} = 
$result_nodes{'complex_float'};
-$result_nodes{'complex_float'}{'menu_child'}{'node_up'} = 
$result_nodes{'complex_float'};
-$result_nodes{'complex_float'}{'node_next'} = 
$result_nodes{'complex_float'}{'menu_child'};
+$result_nodes{'complex_float'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'complex_float'};
+$result_nodes{'complex_float'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'complex_float'};
+$result_nodes{'complex_float'}{'structure'}{'node_next'} = 
$result_nodes{'complex_float'}{'structure'}{'menu_child'};
 
 $result_menus{'complex_float'} = {
   'cmdname' => 'node',
@@ -4682,19 +4690,23 @@ $result_menus{'complex_float'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'complex_float'}{'menu_child'}{'menu_up'} = 
$result_menus{'complex_float'};
+$result_menus{'complex_float'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'complex_float'};
 
 $result_errors{'complex_float'} = [];
 
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index d9d6220b3d..5b7d4d9f8b 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -303,7 +303,8 @@ $result_trees{'float_copying'} = {
                                                 'line_nr' => 35,
                                                 'macro' => ''
                                               },
-                                              'parent' => {}
+                                              'parent' => {},
+                                              'structure' => {}
                                             },
                                             'node_argument' => {
                                               'node_content' => [
@@ -655,7 +656,8 @@ $result_trees{'float_copying'} = {
         'line_nr' => 26,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1240,7 +1242,8 @@ $result_sectioning{'float_copying'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1256,7 +1259,8 @@ $result_sectioning{'float_copying'} = {
                     'isindex' => 1,
                     'normalized' => 'Copying-and-floats',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1295,26 +1299,6 @@ $result_nodes{'float_copying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'appendix',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 'A'
-        }
-      },
-      'isindex' => 1,
-      'normalized' => 'Copying-and-floats',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1330,11 +1314,35 @@ $result_nodes{'float_copying'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'appendix',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 'A'
+          }
+        },
+        'isindex' => 1,
+        'normalized' => 'Copying-and-floats',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'float_copying'}{'menu_child'}{'node_prev'} = 
$result_nodes{'float_copying'};
-$result_nodes{'float_copying'}{'menu_child'}{'node_up'} = 
$result_nodes{'float_copying'};
-$result_nodes{'float_copying'}{'node_next'} = 
$result_nodes{'float_copying'}{'menu_child'};
+$result_nodes{'float_copying'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'float_copying'};
+$result_nodes{'float_copying'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'float_copying'};
+$result_nodes{'float_copying'}{'structure'}{'node_next'} = 
$result_nodes{'float_copying'}{'structure'}{'menu_child'};
 
 $result_menus{'float_copying'} = {
   'cmdname' => 'node',
@@ -1342,20 +1350,24 @@ $result_menus{'float_copying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'Copying-and-floats',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'Copying-and-floats',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'float_copying'}{'menu_child'}{'menu_up'} = 
$result_menus{'float_copying'};
+$result_menus{'float_copying'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'float_copying'};
 
 $result_errors{'float_copying'} = [];
 
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index cf2cb7aa8e..55e933773a 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -259,7 +259,8 @@ $result_trees{'footnote_in_caption'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -324,7 +325,8 @@ $result_nodes{'footnote_in_caption'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'footnote_in_caption'} = {
@@ -332,7 +334,8 @@ $result_menus{'footnote_in_caption'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'footnote_in_caption'} = [];
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 e85670834d..8902c3dd3d 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -269,7 +269,8 @@ $result_trees{'footnote_in_caption_and_error'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -335,7 +336,8 @@ $result_nodes{'footnote_in_caption_and_error'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'footnote_in_caption_and_error'} = {
@@ -343,7 +345,8 @@ $result_menus{'footnote_in_caption_and_error'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'footnote_in_caption_and_error'} = [
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 4408271d83..a330d6af39 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -51,7 +51,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1721,7 +1722,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 64,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2874,7 +2876,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 101,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3070,7 +3073,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 110,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3611,7 +3615,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 129,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3874,7 +3879,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 139,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4242,7 +4248,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 151,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4673,7 +4680,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 167,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4937,7 +4945,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 177,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6807,7 +6816,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -6822,7 +6832,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6838,7 +6849,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6862,7 +6874,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'Unnumbered',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6877,7 +6890,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                         'extra' => {
                           'normalized' => 'Section-within-unnumbered',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6901,7 +6915,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'Chapter-with-unnumbsubsec',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6917,7 +6932,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                         'extra' => {
                           'normalized' => 'unnumbered-sec',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6941,7 +6957,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'Appendix-for-float',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6962,7 +6979,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'normalized' => 'list-of-floats',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -7020,87 +7038,38 @@ $result_nodes{'numbering_captions_listoffloats'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
+  'menus' => [
+    {
+      'cmdname' => 'menu',
       'extra' => {
-        'associated_section' => {
-          'cmdname' => 'section',
+        'end_command' => {
+          'cmdname' => 'end',
           'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 2,
-            'number' => '1.1'
-          }
-        },
-        'normalized' => 'section',
-        'spaces_before_argument' => ' '
-      },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
           }
         }
       }
-    ],
-    'node_next' => {
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'unnumbered',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'Unnumbered',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2
-            }
-          },
-          'normalized' => 'Section-within-unnumbered',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -7116,131 +7085,198 @@ $result_nodes{'numbering_captions_listoffloats'} = {
           }
         }
       ],
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 2
-            }
-          },
-          'normalized' => 'Chapter-with-unnumbsubsec',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'unnumberedsec',
+              'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             },
-            'normalized' => 'unnumbered-sec',
+            'normalized' => 'section',
             'spaces_before_argument' => ' '
           },
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+          'structure' => {
+            'node_up' => {}
           }
-        ],
+        },
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'appendix',
+              'cmdname' => 'unnumbered',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 1,
-                'number' => 'A'
+                'level' => 1
               }
             },
-            'normalized' => 'Appendix-for-float',
+            'normalized' => 'Unnumbered',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumbered',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 1
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
                 }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'section',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2
+                  }
+                },
+                'normalized' => 'Section-within-unnumbered',
+                'spaces_before_argument' => ' '
               },
-              'normalized' => 'list-of-floats',
-              'spaces_before_argument' => ' '
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 2
+                  }
+                },
+                'normalized' => 'Chapter-with-unnumbsubsec',
+                'spaces_before_argument' => ' '
+              },
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
+                  'extra' => {
+                    'end_command' => {
+                      'cmdname' => 'end',
+                      'extra' => {
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
+                    }
+                  }
+                }
+              ],
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'unnumberedsec',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 2
+                      }
+                    },
+                    'normalized' => 'unnumbered-sec',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_up' => {}
+                  }
+                },
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'appendix',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 1,
+                        'number' => 'A'
+                      }
+                    },
+                    'normalized' => 'Appendix-for-float',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'unnumbered',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 1
+                          }
+                        },
+                        'normalized' => 'list-of-floats',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
             },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'}{'menu_child'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'numbering_captions_listoffloats'}{'menu_child'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_prev'} = 
$result_nodes{'numbering_captions_listoffloats'};
-$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_up'} = 
$result_nodes{'numbering_captions_listoffloats'};
-$result_nodes{'numbering_captions_listoffloats'}{'node_next'} = 
$result_nodes{'numbering_captions_listoffloats'}{'menu_child'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'numbering_captions_listoffloats'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'numbering_captions_listoffloats'};
+$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'node_next'} = 
$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'menu_child'};
 
 $result_menus{'numbering_captions_listoffloats'} = {
   'cmdname' => 'node',
@@ -7248,111 +7284,129 @@ $result_menus{'numbering_captions_listoffloats'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
-        'spaces_before_argument' => ' '
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'Unnumbered',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'Section-within-unnumbered',
-          'spaces_before_argument' => ' '
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'Unnumbered' => 1
-        }
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'Chapter-with-unnumbsubsec',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'unnumbered-sec',
+            'normalized' => 'section',
             'spaces_before_argument' => ' '
           },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Chapter-with-unnumbsubsec' => 1
+          'structure' => {
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
           }
         },
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Appendix-for-float',
+            'normalized' => 'Unnumbered',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'list-of-floats',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'Section-within-unnumbered',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Unnumbered' => 1
+                }
+              }
+            },
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'Chapter-with-unnumbsubsec',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'unnumbered-sec',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Chapter-with-unnumbsubsec' => 1
+                    }
+                  }
+                },
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'Appendix-for-float',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'list-of-floats',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
             },
             'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'}{'menu_child'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'numbering_captions_listoffloats'}{'menu_child'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'};
-$result_menus{'numbering_captions_listoffloats'}{'menu_child'}{'menu_up'} = 
$result_menus{'numbering_captions_listoffloats'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'};
+$result_menus{'numbering_captions_listoffloats'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'numbering_captions_listoffloats'};
 
 $result_errors{'numbering_captions_listoffloats'} = [];
 
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index fb7ef8efc9..ac44ff33d1 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -51,7 +51,8 @@ $result_trees{'accent'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3133,7 +3134,8 @@ $result_sectioning{'accent'} = {
             'extra' => {
               'normalized' => 'Top-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3161,7 +3163,8 @@ $result_nodes{'accent'} = {
     },
     'normalized' => 'Top-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'accent'} = {
@@ -3169,7 +3172,8 @@ $result_menus{'accent'} = {
   'extra' => {
     'normalized' => 'Top-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'accent'} = [];
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 9cbbd8293d..975a65af99 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -51,7 +51,8 @@ $result_trees{'accent_enable_encoding'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3133,7 +3134,8 @@ $result_sectioning{'accent_enable_encoding'} = {
             'extra' => {
               'normalized' => 'Top-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3161,7 +3163,8 @@ $result_nodes{'accent_enable_encoding'} = {
     },
     'normalized' => 'Top-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'accent_enable_encoding'} = {
@@ -3169,7 +3172,8 @@ $result_menus{'accent_enable_encoding'} = {
   'extra' => {
     'normalized' => 'Top-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'accent_enable_encoding'} = [];
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index d80562bfc0..df2b4e7f8c 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -89,7 +89,8 @@ $result_trees{'accentenc'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3178,7 +3179,8 @@ $result_sectioning{'accentenc'} = {
             'extra' => {
               'normalized' => 'Top-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3206,7 +3208,8 @@ $result_nodes{'accentenc'} = {
     },
     'normalized' => 'Top-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'accentenc'} = {
@@ -3214,7 +3217,8 @@ $result_menus{'accentenc'} = {
   'extra' => {
     'normalized' => 'Top-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'accentenc'} = [];
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index ca5f26d23c..a2423b6a6c 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -89,7 +89,8 @@ $result_trees{'accentenc_enable_encoding'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3178,7 +3179,8 @@ $result_sectioning{'accentenc_enable_encoding'} = {
             'extra' => {
               'normalized' => 'Top-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3206,7 +3208,8 @@ $result_nodes{'accentenc_enable_encoding'} = {
     },
     'normalized' => 'Top-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'accentenc_enable_encoding'} = {
@@ -3214,7 +3217,8 @@ $result_menus{'accentenc_enable_encoding'} = {
   'extra' => {
     'normalized' => 'Top-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'accentenc_enable_encoding'} = [];
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 c370ca0fcb..1bb4cdd4db 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -51,7 +51,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4832,7 +4833,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 34,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5025,7 +5027,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5283,7 +5286,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 40,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5624,7 +5628,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 43,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5982,7 +5987,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 46,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6244,7 +6250,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 49,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6543,7 +6550,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 52,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6876,7 +6884,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 55,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -7392,7 +7401,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 58,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -8095,7 +8105,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 61,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -8670,7 +8681,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 64,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9039,7 +9051,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9364,7 +9377,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 70,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9701,7 +9715,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 73,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9900,7 +9915,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 76,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10078,7 +10094,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 79,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10345,7 +10362,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 82,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10592,7 +10610,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 87,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10840,7 +10859,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 90,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -11033,7 +11053,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 95,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -11446,7 +11467,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 100,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12025,7 +12047,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 103,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12326,7 +12349,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 106,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12477,7 +12501,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 109,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12620,7 +12645,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 112,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12767,7 +12793,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 115,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12998,7 +13025,8 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 118,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -21143,7 +21171,8 @@ $result_sectioning{'at_commands_in_refs'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -21158,7 +21187,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '-_007b-_007d',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21178,7 +21208,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '----_0021---_002e--_002e-_003f-_0040',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21199,7 +21230,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_0040-_007b-_007d-_005c-_0023',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21220,7 +21252,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21241,7 +21274,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21262,7 +21296,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_2265-_2264-_2192',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21283,7 +21318,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21304,7 +21340,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_21d2-_00b0-a-b--_00e5',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21325,7 +21362,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21346,7 +21384,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => '  '
               },
@@ -21367,7 +21406,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21388,7 +21428,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_0131-_1e14-_1e08',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21409,7 +21450,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21430,7 +21472,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21451,7 +21494,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21472,7 +21516,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'AAA-AAA-BBB',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21493,7 +21538,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'CCC-CCC-DDD',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21514,7 +21560,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21535,7 +21582,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'f_002d_002dile1-f_002d_002dile',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21556,7 +21604,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '-_0040-_007b_007d-_002e-',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21577,7 +21626,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21598,7 +21648,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21619,7 +21670,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => '8_002e27in',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21640,7 +21692,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'sansserif-slanted',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21661,7 +21714,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'indicateurl',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21682,7 +21736,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 'gH-3rd',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21703,7 +21758,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21847,23 +21903,23 @@ $result_nodes{'at_commands_in_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => '-_007b-_007d',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -21873,28 +21929,13 @@ $result_nodes{'at_commands_in_refs'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => '----_0021---_002e--_002e-_003f-_0040',
+        'normalized' => '-_007b-_007d',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
-          },
-          'normalized' => '_0040-_007b-_007d-_005c-_0023',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
@@ -21905,28 +21946,13 @@ $result_nodes{'at_commands_in_refs'} = {
               },
               'structure' => {
                 'level' => 1,
-                'number' => 4
+                'number' => 2
               }
             },
-            'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 1,
-                  'number' => 5
-                }
-              },
-              'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
@@ -21937,28 +21963,13 @@ $result_nodes{'at_commands_in_refs'} = {
                   },
                   'structure' => {
                     'level' => 1,
-                    'number' => 6
+                    'number' => 3
                   }
                 },
-                'normalized' => '_2265-_2264-_2192',
+                'normalized' => '_0040-_007b-_007d-_005c-_0023',
                 'spaces_before_argument' => ' '
               },
-              'node_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 1,
-                      'number' => 7
-                    }
-                  },
-                  'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                  'spaces_before_argument' => ' '
-                },
+              'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
@@ -21969,60 +21980,30 @@ $result_nodes{'at_commands_in_refs'} = {
                       },
                       'structure' => {
                         'level' => 1,
-                        'number' => 8
+                        'number' => 4
                       }
                     },
-                    'normalized' => '_21d2-_00b0-a-b--_00e5',
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
                     'spaces_before_argument' => ' '
                   },
-                  'node_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 1,
-                          'number' => 9
-                        }
-                      },
-                      'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                      'spaces_before_argument' => ' '
-                    },
+                  'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'spaces_before_argument' => '  '
+                            'spaces_before_argument' => ' '
                           },
                           'structure' => {
                             'level' => 1,
-                            'number' => 10
+                            'number' => 5
                           }
                         },
-                        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
                         'spaces_before_argument' => ' '
                       },
-                      'node_next' => {
-                        'cmdname' => 'node',
-                        'extra' => {
-                          'associated_section' => {
-                            'cmdname' => 'chapter',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
-                            'structure' => {
-                              'level' => 1,
-                              'number' => 11
-                            }
-                          },
-                          'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                          'spaces_before_argument' => ' '
-                        },
+                      'structure' => {
                         'node_next' => {
                           'cmdname' => 'node',
                           'extra' => {
@@ -22033,28 +22014,13 @@ $result_nodes{'at_commands_in_refs'} = {
                               },
                               'structure' => {
                                 'level' => 1,
-                                'number' => 12
+                                'number' => 6
                               }
                             },
-                            'normalized' => '_0131-_1e14-_1e08',
+                            'normalized' => '_2265-_2264-_2192',
                             'spaces_before_argument' => ' '
                           },
-                          'node_next' => {
-                            'cmdname' => 'node',
-                            'extra' => {
-                              'associated_section' => {
-                                'cmdname' => 'chapter',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
-                                'structure' => {
-                                  'level' => 1,
-                                  'number' => 13
-                                }
-                              },
-                              'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                              'spaces_before_argument' => ' '
-                            },
+                          'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
                               'extra' => {
@@ -22065,28 +22031,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                   },
                                   'structure' => {
                                     'level' => 1,
-                                    'number' => 14
+                                    'number' => 7
                                   }
                                 },
-                                'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
                                 'spaces_before_argument' => ' '
                               },
-                              'node_next' => {
-                                'cmdname' => 'node',
-                                'extra' => {
-                                  'associated_section' => {
-                                    'cmdname' => 'chapter',
-                                    'extra' => {
-                                      'spaces_before_argument' => ' '
-                                    },
-                                    'structure' => {
-                                      'level' => 1,
-                                      'number' => 15
-                                    }
-                                  },
-                                  'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                  'spaces_before_argument' => ' '
-                                },
+                              'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
@@ -22097,28 +22048,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                       },
                                       'structure' => {
                                         'level' => 1,
-                                        'number' => 16
+                                        'number' => 8
                                       }
                                     },
-                                    'normalized' => 'AAA-AAA-BBB',
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
                                     'spaces_before_argument' => ' '
                                   },
-                                  'node_next' => {
-                                    'cmdname' => 'node',
-                                    'extra' => {
-                                      'associated_section' => {
-                                        'cmdname' => 'chapter',
-                                        'extra' => {
-                                          'spaces_before_argument' => ' '
-                                        },
-                                        'structure' => {
-                                          'level' => 1,
-                                          'number' => 17
-                                        }
-                                      },
-                                      'normalized' => 'CCC-CCC-DDD',
-                                      'spaces_before_argument' => ' '
-                                    },
+                                  'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
@@ -22129,60 +22065,30 @@ $result_nodes{'at_commands_in_refs'} = {
                                           },
                                           'structure' => {
                                             'level' => 1,
-                                            'number' => 18
+                                            'number' => 9
                                           }
                                         },
-                                        'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
                                         'spaces_before_argument' => ' '
                                       },
-                                      'node_next' => {
-                                        'cmdname' => 'node',
-                                        'extra' => {
-                                          'associated_section' => {
-                                            'cmdname' => 'chapter',
-                                            'extra' => {
-                                              'spaces_before_argument' => ' '
-                                            },
-                                            'structure' => {
-                                              'level' => 1,
-                                              'number' => 19
-                                            }
-                                          },
-                                          'normalized' => 
'f_002d_002dile1-f_002d_002dile',
-                                          'spaces_before_argument' => ' '
-                                        },
+                                      'structure' => {
                                         'node_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
                                               'extra' => {
-                                                'spaces_before_argument' => ' '
+                                                'spaces_before_argument' => '  
'
                                               },
                                               'structure' => {
                                                 'level' => 1,
-                                                'number' => 20
+                                                'number' => 10
                                               }
                                             },
-                                            'normalized' => 
'-_0040-_007b_007d-_002e-',
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
                                             'spaces_before_argument' => ' '
                                           },
-                                          'node_next' => {
-                                            'cmdname' => 'node',
-                                            'extra' => {
-                                              'associated_section' => {
-                                                'cmdname' => 'chapter',
-                                                'extra' => {
-                                                  'spaces_before_argument' => 
' '
-                                                },
-                                                'structure' => {
-                                                  'level' => 1,
-                                                  'number' => 21
-                                                }
-                                              },
-                                              'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                              'spaces_before_argument' => ' '
-                                            },
+                                          'structure' => {
                                             'node_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
@@ -22193,28 +22099,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                   },
                                                   'structure' => {
                                                     'level' => 1,
-                                                    'number' => 22
+                                                    'number' => 11
                                                   }
                                                 },
-                                                'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
                                                 'spaces_before_argument' => ' '
                                               },
-                                              'node_next' => {
-                                                'cmdname' => 'node',
-                                                'extra' => {
-                                                  'associated_section' => {
-                                                    'cmdname' => 'chapter',
-                                                    'extra' => {
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
-                                                    'structure' => {
-                                                      'level' => 1,
-                                                      'number' => 23
-                                                    }
-                                                  },
-                                                  'normalized' => '8_002e27in',
-                                                  'spaces_before_argument' => 
' '
-                                                },
+                                              'structure' => {
                                                 'node_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
@@ -22225,28 +22116,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                       },
                                                       'structure' => {
                                                         'level' => 1,
-                                                        'number' => 24
+                                                        'number' => 12
                                                       }
                                                     },
-                                                    'normalized' => 
'sansserif-slanted',
+                                                    'normalized' => 
'_0131-_1e14-_1e08',
                                                     'spaces_before_argument' 
=> ' '
                                                   },
-                                                  'node_next' => {
-                                                    'cmdname' => 'node',
-                                                    'extra' => {
-                                                      'associated_section' => {
-                                                        'cmdname' => 'chapter',
-                                                        'extra' => {
-                                                          
'spaces_before_argument' => ' '
-                                                        },
-                                                        'structure' => {
-                                                          'level' => 1,
-                                                          'number' => 25
-                                                        }
-                                                      },
-                                                      'normalized' => 
'indicateurl',
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                  'structure' => {
                                                     'node_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
@@ -22257,181 +22133,417 @@ $result_nodes{'at_commands_in_refs'} = {
                                                           },
                                                           'structure' => {
                                                             'level' => 1,
-                                                            'number' => 26
+                                                            'number' => 13
                                                           }
                                                         },
-                                                        'normalized' => 
'gH-3rd',
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
                                                         
'spaces_before_argument' => ' '
                                                       },
-                                                      'node_next' => {
-                                                        'cmdname' => 'node',
-                                                        'extra' => {
-                                                          'associated_section' 
=> {
-                                                            'cmdname' => 
'chapter',
-                                                            'extra' => {
-                                                              
'spaces_before_argument' => ' '
+                                                      'structure' => {
+                                                        'node_next' => {
+                                                          'cmdname' => 'node',
+                                                          'extra' => {
+                                                            
'associated_section' => {
+                                                              'cmdname' => 
'chapter',
+                                                              'extra' => {
+                                                                
'spaces_before_argument' => ' '
+                                                              },
+                                                              'structure' => {
+                                                                'level' => 1,
+                                                                'number' => 14
+                                                              }
                                                             },
-                                                            'structure' => {
-                                                              'level' => 1,
-                                                              'number' => 27
-                                                            }
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                                            
'spaces_before_argument' => ' '
                                                           },
-                                                          'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                          
'spaces_before_argument' => ' '
+                                                          'structure' => {
+                                                            'node_next' => {
+                                                              'cmdname' => 
'node',
+                                                              'extra' => {
+                                                                
'associated_section' => {
+                                                                  'cmdname' => 
'chapter',
+                                                                  'extra' => {
+                                                                    
'spaces_before_argument' => ' '
+                                                                  },
+                                                                  'structure' 
=> {
+                                                                    'level' => 
1,
+                                                                    'number' 
=> 15
+                                                                  }
+                                                                },
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
+                                                                
'spaces_before_argument' => ' '
+                                                              },
+                                                              'structure' => {
+                                                                'node_next' => 
{
+                                                                  'cmdname' => 
'node',
+                                                                  'extra' => {
+                                                                    
'associated_section' => {
+                                                                      
'cmdname' => 'chapter',
+                                                                      'extra' 
=> {
+                                                                        
'spaces_before_argument' => ' '
+                                                                      },
+                                                                      
'structure' => {
+                                                                        
'level' => 1,
+                                                                        
'number' => 16
+                                                                      }
+                                                                    },
+                                                                    
'normalized' => 'AAA-AAA-BBB',
+                                                                    
'spaces_before_argument' => ' '
+                                                                  },
+                                                                  'structure' 
=> {
+                                                                    
'node_next' => {
+                                                                      
'cmdname' => 'node',
+                                                                      'extra' 
=> {
+                                                                        
'associated_section' => {
+                                                                          
'cmdname' => 'chapter',
+                                                                          
'extra' => {
+                                                                            
'spaces_before_argument' => ' '
+                                                                          },
+                                                                          
'structure' => {
+                                                                            
'level' => 1,
+                                                                            
'number' => 17
+                                                                          }
+                                                                        },
+                                                                        
'normalized' => 'CCC-CCC-DDD',
+                                                                        
'spaces_before_argument' => ' '
+                                                                      },
+                                                                      
'structure' => {
+                                                                        
'node_next' => {
+                                                                          
'cmdname' => 'node',
+                                                                          
'extra' => {
+                                                                            
'associated_section' => {
+                                                                              
'cmdname' => 'chapter',
+                                                                              
'extra' => {
+                                                                               
 'spaces_before_argument' => ' '
+                                                                              
},
+                                                                              
'structure' => {
+                                                                               
 'level' => 1,
+                                                                               
 'number' => 18
+                                                                              }
+                                                                            },
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
+                                                                            
'spaces_before_argument' => ' '
+                                                                          },
+                                                                          
'structure' => {
+                                                                            
'node_next' => {
+                                                                              
'cmdname' => 'node',
+                                                                              
'extra' => {
+                                                                               
 'associated_section' => {
+                                                                               
   'cmdname' => 'chapter',
+                                                                               
   'extra' => {
+                                                                               
     'spaces_before_argument' => ' '
+                                                                               
   },
+                                                                               
   'structure' => {
+                                                                               
     'level' => 1,
+                                                                               
     'number' => 19
+                                                                               
   }
+                                                                               
 },
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
+                                                                               
 'spaces_before_argument' => ' '
+                                                                              
},
+                                                                              
'structure' => {
+                                                                               
 'node_next' => {
+                                                                               
   'cmdname' => 'node',
+                                                                               
   'extra' => {
+                                                                               
     'associated_section' => {
+                                                                               
       'cmdname' => 'chapter',
+                                                                               
       'extra' => {
+                                                                               
         'spaces_before_argument' => ' '
+                                                                               
       },
+                                                                               
       'structure' => {
+                                                                               
         'level' => 1,
+                                                                               
         'number' => 20
+                                                                               
       }
+                                                                               
     },
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
+                                                                               
     'spaces_before_argument' => ' '
+                                                                               
   },
+                                                                               
   'structure' => {
+                                                                               
     'node_next' => {
+                                                                               
       'cmdname' => 'node',
+                                                                               
       'extra' => {
+                                                                               
         'associated_section' => {
+                                                                               
           'cmdname' => 'chapter',
+                                                                               
           'extra' => {
+                                                                               
             'spaces_before_argument' => ' '
+                                                                               
           },
+                                                                               
           'structure' => {
+                                                                               
             'level' => 1,
+                                                                               
             'number' => 21
+                                                                               
           }
+                                                                               
         },
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
+                                                                               
         'spaces_before_argument' => ' '
+                                                                               
       },
+                                                                               
       'structure' => {
+                                                                               
         'node_next' => {
+                                                                               
           'cmdname' => 'node',
+                                                                               
           'extra' => {
+                                                                               
             'associated_section' => {
+                                                                               
               'cmdname' => 'chapter',
+                                                                               
               'extra' => {
+                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
               },
+                                                                               
               'structure' => {
+                                                                               
                 'level' => 1,
+                                                                               
                 'number' => 22
+                                                                               
               }
+                                                                               
             },
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
+                                                                               
             'spaces_before_argument' => ' '
+                                                                               
           },
+                                                                               
           'structure' => {
+                                                                               
             'node_next' => {
+                                                                               
               'cmdname' => 'node',
+                                                                               
               'extra' => {
+                                                                               
                 'associated_section' => {
+                                                                               
                   'cmdname' => 'chapter',
+                                                                               
                   'extra' => {
+                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                   },
+                                                                               
                   'structure' => {
+                                                                               
                     'level' => 1,
+                                                                               
                     'number' => 23
+                                                                               
                   }
+                                                                               
                 },
+                                                                               
                 'normalized' => '8_002e27in',
+                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
               },
+                                                                               
               'structure' => {
+                                                                               
                 'node_next' => {
+                                                                               
                   'cmdname' => 'node',
+                                                                               
                   'extra' => {
+                                                                               
                     'associated_section' => {
+                                                                               
                       'cmdname' => 'chapter',
+                                                                               
                       'extra' => {
+                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                       },
+                                                                               
                       'structure' => {
+                                                                               
                         'level' => 1,
+                                                                               
                         'number' => 24
+                                                                               
                       }
+                                                                               
                     },
+                                                                               
                     'normalized' => 'sansserif-slanted',
+                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                   },
+                                                                               
                   'structure' => {
+                                                                               
                     'node_next' => {
+                                                                               
                       'cmdname' => 'node',
+                                                                               
                       'extra' => {
+                                                                               
                         'associated_section' => {
+                                                                               
                           'cmdname' => 'chapter',
+                                                                               
                           'extra' => {
+                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                           },
+                                                                               
                           'structure' => {
+                                                                               
                             'level' => 1,
+                                                                               
                             'number' => 25
+                                                                               
                           }
+                                                                               
                         },
+                                                                               
                         'normalized' => 'indicateurl',
+                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                       },
+                                                                               
                       'structure' => {
+                                                                               
                         'node_next' => {
+                                                                               
                           'cmdname' => 'node',
+                                                                               
                           'extra' => {
+                                                                               
                             'associated_section' => {
+                                                                               
                               'cmdname' => 'chapter',
+                                                                               
                               'extra' => {
+                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                               },
+                                                                               
                               'structure' => {
+                                                                               
                                 'level' => 1,
+                                                                               
                                 'number' => 26
+                                                                               
                               }
+                                                                               
                             },
+                                                                               
                             'normalized' => 'gH-3rd',
+                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                           },
+                                                                               
                           'structure' => {
+                                                                               
                             'node_next' => {
+                                                                               
                               'cmdname' => 'node',
+                                                                               
                               'extra' => {
+                                                                               
                                 'associated_section' => {
+                                                                               
                                   'cmdname' => 'chapter',
+                                                                               
                                   'extra' => {
+                                                                               
                                     'spaces_before_argument' => ' '
+                                                                               
                                   },
+                                                                               
                                   'structure' => {
+                                                                               
                                     'level' => 1,
+                                                                               
                                     'number' => 27
+                                                                               
                                   }
+                                                                               
                                 },
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
+                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                               },
+                                                                               
                               'structure' => {
+                                                                               
                                 'node_prev' => {},
+                                                                               
                                 'node_up' => {}
+                                                                               
                               }
+                                                                               
                             },
+                                                                               
                             'node_prev' => {},
+                                                                               
                             'node_up' => {}
+                                                                               
                           }
+                                                                               
                         },
+                                                                               
                         'node_prev' => {},
+                                                                               
                         'node_up' => {}
+                                                                               
                       }
+                                                                               
                     },
+                                                                               
                     'node_prev' => {},
+                                                                               
                     'node_up' => {}
+                                                                               
                   }
+                                                                               
                 },
+                                                                               
                 'node_prev' => {},
+                                                                               
                 'node_up' => {}
+                                                                               
               }
+                                                                               
             },
+                                                                               
             'node_prev' => {},
+                                                                               
             'node_up' => {}
+                                                                               
           }
+                                                                               
         },
+                                                                               
         'node_prev' => {},
+                                                                               
         'node_up' => {}
+                                                                               
       }
+                                                                               
     },
+                                                                               
     'node_prev' => {},
+                                                                               
     'node_up' => {}
+                                                                               
   }
+                                                                               
 },
+                                                                               
 'node_prev' => {},
+                                                                               
 'node_up' => {}
+                                                                              }
+                                                                            },
+                                                                            
'node_prev' => {},
+                                                                            
'node_up' => {}
+                                                                          }
+                                                                        },
+                                                                        
'node_prev' => {},
+                                                                        
'node_up' => {}
+                                                                      }
+                                                                    },
+                                                                    
'node_prev' => {},
+                                                                    'node_up' 
=> {}
+                                                                  }
+                                                                },
+                                                                'node_prev' => 
{},
+                                                                'node_up' => {}
+                                                              }
+                                                            },
+                                                            'node_prev' => {},
+                                                            'node_up' => {}
+                                                          }
                                                         },
                                                         'node_prev' => {},
                                                         'node_up' => {}
-                                                      },
-                                                      'node_prev' => {},
-                                                      'node_up' => {}
+                                                      }
                                                     },
                                                     'node_prev' => {},
                                                     'node_up' => {}
-                                                  },
-                                                  'node_prev' => {},
-                                                  'node_up' => {}
+                                                  }
                                                 },
                                                 'node_prev' => {},
                                                 'node_up' => {}
-                                              },
-                                              'node_prev' => {},
-                                              'node_up' => {}
+                                              }
                                             },
                                             'node_prev' => {},
                                             'node_up' => {}
-                                          },
-                                          'node_prev' => {},
-                                          'node_up' => {}
+                                          }
                                         },
                                         'node_prev' => {},
                                         'node_up' => {}
-                                      },
-                                      'node_prev' => {},
-                                      'node_up' => {}
+                                      }
                                     },
                                     'node_prev' => {},
                                     'node_up' => {}
-                                  },
-                                  'node_prev' => {},
-                                  'node_up' => {}
+                                  }
                                 },
                                 'node_prev' => {},
                                 'node_up' => {}
-                              },
-                              'node_prev' => {},
-                              'node_up' => {}
+                              }
                             },
                             'node_prev' => {},
                             'node_up' => {}
-                          },
-                          'node_prev' => {},
-                          'node_up' => {}
+                          }
                         },
                         'node_prev' => {},
                         'node_up' => {}
-                      },
-                      'node_prev' => {},
-                      'node_up' => {}
+                      }
                     },
                     'node_prev' => {},
                     'node_up' => {}
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
+                  }
                 },
                 'node_prev' => {},
                 'node_up' => {}
-              },
-              'node_prev' => {},
-              'node_up' => {}
+              }
             },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'
 [...]
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'at_commands_in_refs'}{'menu_child'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_prev'} = 
$result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_up'} = 
$result_nodes{'at_commands_in_refs'};
-$result_nodes{'at_commands_in_refs'}{'node_next'} = 
$result_nodes{'at_commands_in_refs'}{'menu_child'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_no [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_node [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs'} [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child' [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'
 [...]
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs'};
+$result_nodes{'at_commands_in_refs'}{'structure'}{'node_next'} = 
$result_nodes{'at_commands_in_refs'}{'structure'}{'menu_child'};
 
 $result_menus{'at_commands_in_refs'} = {
   'cmdname' => 'node',
@@ -22439,178 +22551,299 @@ $result_menus{'at_commands_in_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '-_007b-_007d',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '----_0021---_002e--_002e-_003f-_0040',
+        'normalized' => '-_007b-_007d',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_0040-_007b-_007d-_005c-_0023',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => '_2265-_2264-_2192',
+                'normalized' => '_0040-_007b-_007d-_005c-_0023',
                 'spaces_before_argument' => ' '
               },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                  'spaces_before_argument' => ' '
-                },
+              'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_21d2-_00b0-a-b--_00e5',
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
                     'spaces_before_argument' => ' '
                   },
-                  'menu_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                      'spaces_before_argument' => ' '
-                    },
+                  'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
                         'spaces_before_argument' => ' '
                       },
-                      'menu_next' => {
-                        'cmdname' => 'node',
-                        'extra' => {
-                          'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                          'spaces_before_argument' => ' '
-                        },
+                      'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => '_0131-_1e14-_1e08',
+                            'normalized' => '_2265-_2264-_2192',
                             'spaces_before_argument' => ' '
                           },
-                          'menu_next' => {
-                            'cmdname' => 'node',
-                            'extra' => {
-                              'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                              'spaces_before_argument' => ' '
-                            },
+                          'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
                                 'spaces_before_argument' => ' '
                               },
-                              'menu_next' => {
-                                'cmdname' => 'node',
-                                'extra' => {
-                                  'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                  'spaces_before_argument' => ' '
-                                },
+                              'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'AAA-AAA-BBB',
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
                                     'spaces_before_argument' => ' '
                                   },
-                                  'menu_next' => {
-                                    'cmdname' => 'node',
-                                    'extra' => {
-                                      'normalized' => 'CCC-CCC-DDD',
-                                      'spaces_before_argument' => ' '
-                                    },
+                                  'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
                                         'spaces_before_argument' => ' '
                                       },
-                                      'menu_next' => {
-                                        'cmdname' => 'node',
-                                        'extra' => {
-                                          'normalized' => 
'f_002d_002dile1-f_002d_002dile',
-                                          'spaces_before_argument' => ' '
-                                        },
+                                      'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 
'-_0040-_007b_007d-_002e-',
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
                                             'spaces_before_argument' => ' '
                                           },
-                                          'menu_next' => {
-                                            'cmdname' => 'node',
-                                            'extra' => {
-                                              'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                              'spaces_before_argument' => ' '
-                                            },
+                                          'structure' => {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
-                                                'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
                                                 'spaces_before_argument' => ' '
                                               },
-                                              'menu_next' => {
-                                                'cmdname' => 'node',
-                                                'extra' => {
-                                                  'normalized' => '8_002e27in',
-                                                  'spaces_before_argument' => 
' '
-                                                },
+                                              'structure' => {
                                                 'menu_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
-                                                    'normalized' => 
'sansserif-slanted',
+                                                    'normalized' => 
'_0131-_1e14-_1e08',
                                                     'spaces_before_argument' 
=> ' '
                                                   },
-                                                  'menu_next' => {
-                                                    'cmdname' => 'node',
-                                                    'extra' => {
-                                                      'normalized' => 
'indicateurl',
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                  'structure' => {
                                                     'menu_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
-                                                        'normalized' => 
'gH-3rd',
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
                                                         
'spaces_before_argument' => ' '
                                                       },
-                                                      'menu_next' => {
-                                                        'cmdname' => 'node',
-                                                        'extra' => {
-                                                          'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                          
'spaces_before_argument' => ' '
+                                                      'structure' => {
+                                                        'menu_next' => {
+                                                          'cmdname' => 'node',
+                                                          'extra' => {
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                                            
'spaces_before_argument' => ' '
+                                                          },
+                                                          'structure' => {
+                                                            'menu_next' => {
+                                                              'cmdname' => 
'node',
+                                                              'extra' => {
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
+                                                                
'spaces_before_argument' => ' '
+                                                              },
+                                                              'structure' => {
+                                                                'menu_next' => 
{
+                                                                  'cmdname' => 
'node',
+                                                                  'extra' => {
+                                                                    
'normalized' => 'AAA-AAA-BBB',
+                                                                    
'spaces_before_argument' => ' '
+                                                                  },
+                                                                  'structure' 
=> {
+                                                                    
'menu_next' => {
+                                                                      
'cmdname' => 'node',
+                                                                      'extra' 
=> {
+                                                                        
'normalized' => 'CCC-CCC-DDD',
+                                                                        
'spaces_before_argument' => ' '
+                                                                      },
+                                                                      
'structure' => {
+                                                                        
'menu_next' => {
+                                                                          
'cmdname' => 'node',
+                                                                          
'extra' => {
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
+                                                                            
'spaces_before_argument' => ' '
+                                                                          },
+                                                                          
'structure' => {
+                                                                            
'menu_next' => {
+                                                                              
'cmdname' => 'node',
+                                                                              
'extra' => {
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
+                                                                               
 'spaces_before_argument' => ' '
+                                                                              
},
+                                                                              
'structure' => {
+                                                                               
 'menu_next' => {
+                                                                               
   'cmdname' => 'node',
+                                                                               
   'extra' => {
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
+                                                                               
     'spaces_before_argument' => ' '
+                                                                               
   },
+                                                                               
   'structure' => {
+                                                                               
     'menu_next' => {
+                                                                               
       'cmdname' => 'node',
+                                                                               
       'extra' => {
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
+                                                                               
         'spaces_before_argument' => ' '
+                                                                               
       },
+                                                                               
       'structure' => {
+                                                                               
         'menu_next' => {
+                                                                               
           'cmdname' => 'node',
+                                                                               
           'extra' => {
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
+                                                                               
             'spaces_before_argument' => ' '
+                                                                               
           },
+                                                                               
           'structure' => {
+                                                                               
             'menu_next' => {
+                                                                               
               'cmdname' => 'node',
+                                                                               
               'extra' => {
+                                                                               
                 'normalized' => '8_002e27in',
+                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
               },
+                                                                               
               'structure' => {
+                                                                               
                 'menu_next' => {
+                                                                               
                   'cmdname' => 'node',
+                                                                               
                   'extra' => {
+                                                                               
                     'normalized' => 'sansserif-slanted',
+                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                   },
+                                                                               
                   'structure' => {
+                                                                               
                     'menu_next' => {
+                                                                               
                       'cmdname' => 'node',
+                                                                               
                       'extra' => {
+                                                                               
                         'normalized' => 'indicateurl',
+                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                       },
+                                                                               
                       'structure' => {
+                                                                               
                         'menu_next' => {
+                                                                               
                           'cmdname' => 'node',
+                                                                               
                           'extra' => {
+                                                                               
                             'normalized' => 'gH-3rd',
+                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                           },
+                                                                               
                           'structure' => {
+                                                                               
                             'menu_next' => {
+                                                                               
                               'cmdname' => 'node',
+                                                                               
                               'extra' => {
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
+                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                               },
+                                                                               
                               'structure' => {
+                                                                               
                                 'menu_prev' => {},
+                                                                               
                                 'menu_up' => {},
+                                                                               
                                 'menu_up_hash' => {
+                                                                               
                                   'Top' => 1
+                                                                               
                                 }
+                                                                               
                               }
+                                                                               
                             },
+                                                                               
                             'menu_prev' => {},
+                                                                               
                             'menu_up' => {},
+                                                                               
                             'menu_up_hash' => {
+                                                                               
                               'Top' => 1
+                                                                               
                             }
+                                                                               
                           }
+                                                                               
                         },
+                                                                               
                         'menu_prev' => {},
+                                                                               
                         'menu_up' => {},
+                                                                               
                         'menu_up_hash' => {
+                                                                               
                           'Top' => 1
+                                                                               
                         }
+                                                                               
                       }
+                                                                               
                     },
+                                                                               
                     'menu_prev' => {},
+                                                                               
                     'menu_up' => {},
+                                                                               
                     'menu_up_hash' => {
+                                                                               
                       'Top' => 1
+                                                                               
                     }
+                                                                               
                   }
+                                                                               
                 },
+                                                                               
                 'menu_prev' => {},
+                                                                               
                 'menu_up' => {},
+                                                                               
                 'menu_up_hash' => {
+                                                                               
                   'Top' => 1
+                                                                               
                 }
+                                                                               
               }
+                                                                               
             },
+                                                                               
             'menu_prev' => {},
+                                                                               
             'menu_up' => {},
+                                                                               
             'menu_up_hash' => {
+                                                                               
               'Top' => 1
+                                                                               
             }
+                                                                               
           }
+                                                                               
         },
+                                                                               
         'menu_prev' => {},
+                                                                               
         'menu_up' => {},
+                                                                               
         'menu_up_hash' => {
+                                                                               
           'Top' => 1
+                                                                               
         }
+                                                                               
       }
+                                                                               
     },
+                                                                               
     'menu_prev' => {},
+                                                                               
     'menu_up' => {},
+                                                                               
     'menu_up_hash' => {
+                                                                               
       'Top' => 1
+                                                                               
     }
+                                                                               
   }
+                                                                               
 },
+                                                                               
 'menu_prev' => {},
+                                                                               
 'menu_up' => {},
+                                                                               
 'menu_up_hash' => {
+                                                                               
   'Top' => 1
+                                                                               
 }
+                                                                              }
+                                                                            },
+                                                                            
'menu_prev' => {},
+                                                                            
'menu_up' => {},
+                                                                            
'menu_up_hash' => {
+                                                                              
'Top' => 1
+                                                                            }
+                                                                          }
+                                                                        },
+                                                                        
'menu_prev' => {},
+                                                                        
'menu_up' => {},
+                                                                        
'menu_up_hash' => {
+                                                                          
'Top' => 1
+                                                                        }
+                                                                      }
+                                                                    },
+                                                                    
'menu_prev' => {},
+                                                                    'menu_up' 
=> {},
+                                                                    
'menu_up_hash' => {
+                                                                      'Top' => 
1
+                                                                    }
+                                                                  }
+                                                                },
+                                                                'menu_prev' => 
{},
+                                                                'menu_up' => 
{},
+                                                                'menu_up_hash' 
=> {
+                                                                  'Top' => 1
+                                                                }
+                                                              }
+                                                            },
+                                                            'menu_prev' => {},
+                                                            'menu_up' => {},
+                                                            'menu_up_hash' => {
+                                                              'Top' => 1
+                                                            }
+                                                          }
                                                         },
                                                         'menu_prev' => {},
                                                         'menu_up' => {},
                                                         'menu_up_hash' => {
                                                           'Top' => 1
                                                         }
-                                                      },
-                                                      'menu_prev' => {},
-                                                      'menu_up' => {},
-                                                      'menu_up_hash' => {
-                                                        'Top' => 1
                                                       }
                                                     },
                                                     'menu_prev' => {},
@@ -22618,11 +22851,6 @@ $result_menus{'at_commands_in_refs'} = {
                                                     'menu_up_hash' => {
                                                       'Top' => 1
                                                     }
-                                                  },
-                                                  'menu_prev' => {},
-                                                  'menu_up' => {},
-                                                  'menu_up_hash' => {
-                                                    'Top' => 1
                                                   }
                                                 },
                                                 'menu_prev' => {},
@@ -22630,11 +22858,6 @@ $result_menus{'at_commands_in_refs'} = {
                                                 'menu_up_hash' => {
                                                   'Top' => 1
                                                 }
-                                              },
-                                              'menu_prev' => {},
-                                              'menu_up' => {},
-                                              'menu_up_hash' => {
-                                                'Top' => 1
                                               }
                                             },
                                             'menu_prev' => {},
@@ -22642,11 +22865,6 @@ $result_menus{'at_commands_in_refs'} = {
                                             'menu_up_hash' => {
                                               'Top' => 1
                                             }
-                                          },
-                                          'menu_prev' => {},
-                                          'menu_up' => {},
-                                          'menu_up_hash' => {
-                                            'Top' => 1
                                           }
                                         },
                                         'menu_prev' => {},
@@ -22654,11 +22872,6 @@ $result_menus{'at_commands_in_refs'} = {
                                         'menu_up_hash' => {
                                           'Top' => 1
                                         }
-                                      },
-                                      'menu_prev' => {},
-                                      'menu_up' => {},
-                                      'menu_up_hash' => {
-                                        'Top' => 1
                                       }
                                     },
                                     'menu_prev' => {},
@@ -22666,11 +22879,6 @@ $result_menus{'at_commands_in_refs'} = {
                                     'menu_up_hash' => {
                                       'Top' => 1
                                     }
-                                  },
-                                  'menu_prev' => {},
-                                  'menu_up' => {},
-                                  'menu_up_hash' => {
-                                    'Top' => 1
                                   }
                                 },
                                 'menu_prev' => {},
@@ -22678,11 +22886,6 @@ $result_menus{'at_commands_in_refs'} = {
                                 'menu_up_hash' => {
                                   'Top' => 1
                                 }
-                              },
-                              'menu_prev' => {},
-                              'menu_up' => {},
-                              'menu_up_hash' => {
-                                'Top' => 1
                               }
                             },
                             'menu_prev' => {},
@@ -22690,11 +22893,6 @@ $result_menus{'at_commands_in_refs'} = {
                             'menu_up_hash' => {
                               'Top' => 1
                             }
-                          },
-                          'menu_prev' => {},
-                          'menu_up' => {},
-                          'menu_up_hash' => {
-                            'Top' => 1
                           }
                         },
                         'menu_prev' => {},
@@ -22702,11 +22900,6 @@ $result_menus{'at_commands_in_refs'} = {
                         'menu_up_hash' => {
                           'Top' => 1
                         }
-                      },
-                      'menu_prev' => {},
-                      'menu_up' => {},
-                      'menu_up_hash' => {
-                        'Top' => 1
                       }
                     },
                     'menu_prev' => {},
@@ -22714,11 +22907,6 @@ $result_menus{'at_commands_in_refs'} = {
                     'menu_up_hash' => {
                       'Top' => 1
                     }
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'Top' => 1
                   }
                 },
                 'menu_prev' => {},
@@ -22726,11 +22914,6 @@ $result_menus{'at_commands_in_refs'} = {
                 'menu_up_hash' => {
                   'Top' => 1
                 }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'Top' => 1
               }
             },
             'menu_prev' => {},
@@ -22738,84 +22921,69 @@ $result_menus{'at_commands_in_refs'} = {
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'
 [...]
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'at_commands_in_refs'}{'menu_child'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'at_commands_in_refs'};
-$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_up'} = 
$result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_me [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menu [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs'} [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs'}{'structure'}{'menu_child' [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'
 [...]
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
+$result_menus{'at_commands_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs'};
 
 $result_errors{'at_commands_in_refs'} = [
   {
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
index c8809b985c..7f75120556 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
@@ -118,7 +118,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4899,7 +4900,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5092,7 +5094,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 40,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5350,7 +5353,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 43,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5691,7 +5695,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 46,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6049,7 +6054,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 49,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6311,7 +6317,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 52,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6610,7 +6617,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 55,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6943,7 +6951,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 58,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -7459,7 +7468,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 61,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -8162,7 +8172,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 64,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -8737,7 +8748,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9106,7 +9118,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 70,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9431,7 +9444,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 73,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9768,7 +9782,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 76,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9967,7 +9982,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 79,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10145,7 +10161,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 82,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10412,7 +10429,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 85,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10659,7 +10677,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 90,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10907,7 +10926,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 93,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -11100,7 +11120,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 98,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -11513,7 +11534,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 103,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12092,7 +12114,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 106,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12393,7 +12416,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 109,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12544,7 +12568,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 112,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12687,7 +12712,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 115,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12834,7 +12860,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 118,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -13065,7 +13092,8 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 121,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -21221,7 +21249,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -21236,7 +21265,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '-_007b-_007d',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21256,7 +21286,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '----_0021---_002e--_002e-_003f-_0040',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21277,7 +21308,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_0040-_007b-_007d-_005c-_0023',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21298,7 +21330,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21319,7 +21352,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21340,7 +21374,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_2265-_2264-_2192',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21361,7 +21396,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21382,7 +21418,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_21d2-_00b0-a-b--_00e5',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21403,7 +21440,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21424,7 +21462,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => '  '
               },
@@ -21445,7 +21484,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21466,7 +21506,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_0131-_1e14-_1e08',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21487,7 +21528,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21508,7 +21550,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21529,7 +21572,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21550,7 +21594,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'AAA-AAA-BBB',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21571,7 +21616,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'CCC-CCC-DDD',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21592,7 +21638,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21613,7 +21660,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'f_002d_002dile1-f_002d_002dile',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21634,7 +21682,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '-_0040-_007b_007d-_002e-',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21655,7 +21704,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21676,7 +21726,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21697,7 +21748,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => '8_002e27in',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21718,7 +21770,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'sansserif-slanted',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21739,7 +21792,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'indicateurl',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21760,7 +21814,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 'gH-3rd',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21781,7 +21836,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21925,23 +21981,23 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => '-_007b-_007d',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -21951,28 +22007,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => '----_0021---_002e--_002e-_003f-_0040',
+        'normalized' => '-_007b-_007d',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
-          },
-          'normalized' => '_0040-_007b-_007d-_005c-_0023',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
@@ -21983,28 +22024,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
               },
               'structure' => {
                 'level' => 1,
-                'number' => 4
+                'number' => 2
               }
             },
-            'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 1,
-                  'number' => 5
-                }
-              },
-              'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
@@ -22015,28 +22041,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                   },
                   'structure' => {
                     'level' => 1,
-                    'number' => 6
+                    'number' => 3
                   }
                 },
-                'normalized' => '_2265-_2264-_2192',
+                'normalized' => '_0040-_007b-_007d-_005c-_0023',
                 'spaces_before_argument' => ' '
               },
-              'node_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 1,
-                      'number' => 7
-                    }
-                  },
-                  'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                  'spaces_before_argument' => ' '
-                },
+              'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
@@ -22047,60 +22058,30 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                       },
                       'structure' => {
                         'level' => 1,
-                        'number' => 8
+                        'number' => 4
                       }
                     },
-                    'normalized' => '_21d2-_00b0-a-b--_00e5',
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
                     'spaces_before_argument' => ' '
                   },
-                  'node_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 1,
-                          'number' => 9
-                        }
-                      },
-                      'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                      'spaces_before_argument' => ' '
-                    },
+                  'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'spaces_before_argument' => '  '
+                            'spaces_before_argument' => ' '
                           },
                           'structure' => {
                             'level' => 1,
-                            'number' => 10
+                            'number' => 5
                           }
                         },
-                        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
                         'spaces_before_argument' => ' '
                       },
-                      'node_next' => {
-                        'cmdname' => 'node',
-                        'extra' => {
-                          'associated_section' => {
-                            'cmdname' => 'chapter',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
-                            'structure' => {
-                              'level' => 1,
-                              'number' => 11
-                            }
-                          },
-                          'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                          'spaces_before_argument' => ' '
-                        },
+                      'structure' => {
                         'node_next' => {
                           'cmdname' => 'node',
                           'extra' => {
@@ -22111,28 +22092,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                               },
                               'structure' => {
                                 'level' => 1,
-                                'number' => 12
+                                'number' => 6
                               }
                             },
-                            'normalized' => '_0131-_1e14-_1e08',
+                            'normalized' => '_2265-_2264-_2192',
                             'spaces_before_argument' => ' '
                           },
-                          'node_next' => {
-                            'cmdname' => 'node',
-                            'extra' => {
-                              'associated_section' => {
-                                'cmdname' => 'chapter',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
-                                'structure' => {
-                                  'level' => 1,
-                                  'number' => 13
-                                }
-                              },
-                              'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                              'spaces_before_argument' => ' '
-                            },
+                          'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
                               'extra' => {
@@ -22143,28 +22109,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                   },
                                   'structure' => {
                                     'level' => 1,
-                                    'number' => 14
+                                    'number' => 7
                                   }
                                 },
-                                'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
                                 'spaces_before_argument' => ' '
                               },
-                              'node_next' => {
-                                'cmdname' => 'node',
-                                'extra' => {
-                                  'associated_section' => {
-                                    'cmdname' => 'chapter',
-                                    'extra' => {
-                                      'spaces_before_argument' => ' '
-                                    },
-                                    'structure' => {
-                                      'level' => 1,
-                                      'number' => 15
-                                    }
-                                  },
-                                  'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                  'spaces_before_argument' => ' '
-                                },
+                              'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
@@ -22175,28 +22126,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                       },
                                       'structure' => {
                                         'level' => 1,
-                                        'number' => 16
+                                        'number' => 8
                                       }
                                     },
-                                    'normalized' => 'AAA-AAA-BBB',
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
                                     'spaces_before_argument' => ' '
                                   },
-                                  'node_next' => {
-                                    'cmdname' => 'node',
-                                    'extra' => {
-                                      'associated_section' => {
-                                        'cmdname' => 'chapter',
-                                        'extra' => {
-                                          'spaces_before_argument' => ' '
-                                        },
-                                        'structure' => {
-                                          'level' => 1,
-                                          'number' => 17
-                                        }
-                                      },
-                                      'normalized' => 'CCC-CCC-DDD',
-                                      'spaces_before_argument' => ' '
-                                    },
+                                  'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
@@ -22207,60 +22143,30 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                           },
                                           'structure' => {
                                             'level' => 1,
-                                            'number' => 18
+                                            'number' => 9
                                           }
                                         },
-                                        'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
                                         'spaces_before_argument' => ' '
                                       },
-                                      'node_next' => {
-                                        'cmdname' => 'node',
-                                        'extra' => {
-                                          'associated_section' => {
-                                            'cmdname' => 'chapter',
-                                            'extra' => {
-                                              'spaces_before_argument' => ' '
-                                            },
-                                            'structure' => {
-                                              'level' => 1,
-                                              'number' => 19
-                                            }
-                                          },
-                                          'normalized' => 
'f_002d_002dile1-f_002d_002dile',
-                                          'spaces_before_argument' => ' '
-                                        },
+                                      'structure' => {
                                         'node_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
                                               'extra' => {
-                                                'spaces_before_argument' => ' '
+                                                'spaces_before_argument' => '  
'
                                               },
                                               'structure' => {
                                                 'level' => 1,
-                                                'number' => 20
+                                                'number' => 10
                                               }
                                             },
-                                            'normalized' => 
'-_0040-_007b_007d-_002e-',
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
                                             'spaces_before_argument' => ' '
                                           },
-                                          'node_next' => {
-                                            'cmdname' => 'node',
-                                            'extra' => {
-                                              'associated_section' => {
-                                                'cmdname' => 'chapter',
-                                                'extra' => {
-                                                  'spaces_before_argument' => 
' '
-                                                },
-                                                'structure' => {
-                                                  'level' => 1,
-                                                  'number' => 21
-                                                }
-                                              },
-                                              'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                              'spaces_before_argument' => ' '
-                                            },
+                                          'structure' => {
                                             'node_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
@@ -22271,28 +22177,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                   },
                                                   'structure' => {
                                                     'level' => 1,
-                                                    'number' => 22
+                                                    'number' => 11
                                                   }
                                                 },
-                                                'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
                                                 'spaces_before_argument' => ' '
                                               },
-                                              'node_next' => {
-                                                'cmdname' => 'node',
-                                                'extra' => {
-                                                  'associated_section' => {
-                                                    'cmdname' => 'chapter',
-                                                    'extra' => {
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
-                                                    'structure' => {
-                                                      'level' => 1,
-                                                      'number' => 23
-                                                    }
-                                                  },
-                                                  'normalized' => '8_002e27in',
-                                                  'spaces_before_argument' => 
' '
-                                                },
+                                              'structure' => {
                                                 'node_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
@@ -22303,28 +22194,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                       },
                                                       'structure' => {
                                                         'level' => 1,
-                                                        'number' => 24
+                                                        'number' => 12
                                                       }
                                                     },
-                                                    'normalized' => 
'sansserif-slanted',
+                                                    'normalized' => 
'_0131-_1e14-_1e08',
                                                     'spaces_before_argument' 
=> ' '
                                                   },
-                                                  'node_next' => {
-                                                    'cmdname' => 'node',
-                                                    'extra' => {
-                                                      'associated_section' => {
-                                                        'cmdname' => 'chapter',
-                                                        'extra' => {
-                                                          
'spaces_before_argument' => ' '
-                                                        },
-                                                        'structure' => {
-                                                          'level' => 1,
-                                                          'number' => 25
-                                                        }
-                                                      },
-                                                      'normalized' => 
'indicateurl',
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                  'structure' => {
                                                     'node_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
@@ -22335,181 +22211,417 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                           },
                                                           'structure' => {
                                                             'level' => 1,
-                                                            'number' => 26
+                                                            'number' => 13
                                                           }
                                                         },
-                                                        'normalized' => 
'gH-3rd',
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
                                                         
'spaces_before_argument' => ' '
                                                       },
-                                                      'node_next' => {
-                                                        'cmdname' => 'node',
-                                                        'extra' => {
-                                                          'associated_section' 
=> {
-                                                            'cmdname' => 
'chapter',
-                                                            'extra' => {
-                                                              
'spaces_before_argument' => ' '
+                                                      'structure' => {
+                                                        'node_next' => {
+                                                          'cmdname' => 'node',
+                                                          'extra' => {
+                                                            
'associated_section' => {
+                                                              'cmdname' => 
'chapter',
+                                                              'extra' => {
+                                                                
'spaces_before_argument' => ' '
+                                                              },
+                                                              'structure' => {
+                                                                'level' => 1,
+                                                                'number' => 14
+                                                              }
                                                             },
-                                                            'structure' => {
-                                                              'level' => 1,
-                                                              'number' => 27
-                                                            }
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                                            
'spaces_before_argument' => ' '
                                                           },
-                                                          'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                          
'spaces_before_argument' => ' '
+                                                          'structure' => {
+                                                            'node_next' => {
+                                                              'cmdname' => 
'node',
+                                                              'extra' => {
+                                                                
'associated_section' => {
+                                                                  'cmdname' => 
'chapter',
+                                                                  'extra' => {
+                                                                    
'spaces_before_argument' => ' '
+                                                                  },
+                                                                  'structure' 
=> {
+                                                                    'level' => 
1,
+                                                                    'number' 
=> 15
+                                                                  }
+                                                                },
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
+                                                                
'spaces_before_argument' => ' '
+                                                              },
+                                                              'structure' => {
+                                                                'node_next' => 
{
+                                                                  'cmdname' => 
'node',
+                                                                  'extra' => {
+                                                                    
'associated_section' => {
+                                                                      
'cmdname' => 'chapter',
+                                                                      'extra' 
=> {
+                                                                        
'spaces_before_argument' => ' '
+                                                                      },
+                                                                      
'structure' => {
+                                                                        
'level' => 1,
+                                                                        
'number' => 16
+                                                                      }
+                                                                    },
+                                                                    
'normalized' => 'AAA-AAA-BBB',
+                                                                    
'spaces_before_argument' => ' '
+                                                                  },
+                                                                  'structure' 
=> {
+                                                                    
'node_next' => {
+                                                                      
'cmdname' => 'node',
+                                                                      'extra' 
=> {
+                                                                        
'associated_section' => {
+                                                                          
'cmdname' => 'chapter',
+                                                                          
'extra' => {
+                                                                            
'spaces_before_argument' => ' '
+                                                                          },
+                                                                          
'structure' => {
+                                                                            
'level' => 1,
+                                                                            
'number' => 17
+                                                                          }
+                                                                        },
+                                                                        
'normalized' => 'CCC-CCC-DDD',
+                                                                        
'spaces_before_argument' => ' '
+                                                                      },
+                                                                      
'structure' => {
+                                                                        
'node_next' => {
+                                                                          
'cmdname' => 'node',
+                                                                          
'extra' => {
+                                                                            
'associated_section' => {
+                                                                              
'cmdname' => 'chapter',
+                                                                              
'extra' => {
+                                                                               
 'spaces_before_argument' => ' '
+                                                                              
},
+                                                                              
'structure' => {
+                                                                               
 'level' => 1,
+                                                                               
 'number' => 18
+                                                                              }
+                                                                            },
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
+                                                                            
'spaces_before_argument' => ' '
+                                                                          },
+                                                                          
'structure' => {
+                                                                            
'node_next' => {
+                                                                              
'cmdname' => 'node',
+                                                                              
'extra' => {
+                                                                               
 'associated_section' => {
+                                                                               
   'cmdname' => 'chapter',
+                                                                               
   'extra' => {
+                                                                               
     'spaces_before_argument' => ' '
+                                                                               
   },
+                                                                               
   'structure' => {
+                                                                               
     'level' => 1,
+                                                                               
     'number' => 19
+                                                                               
   }
+                                                                               
 },
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
+                                                                               
 'spaces_before_argument' => ' '
+                                                                              
},
+                                                                              
'structure' => {
+                                                                               
 'node_next' => {
+                                                                               
   'cmdname' => 'node',
+                                                                               
   'extra' => {
+                                                                               
     'associated_section' => {
+                                                                               
       'cmdname' => 'chapter',
+                                                                               
       'extra' => {
+                                                                               
         'spaces_before_argument' => ' '
+                                                                               
       },
+                                                                               
       'structure' => {
+                                                                               
         'level' => 1,
+                                                                               
         'number' => 20
+                                                                               
       }
+                                                                               
     },
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
+                                                                               
     'spaces_before_argument' => ' '
+                                                                               
   },
+                                                                               
   'structure' => {
+                                                                               
     'node_next' => {
+                                                                               
       'cmdname' => 'node',
+                                                                               
       'extra' => {
+                                                                               
         'associated_section' => {
+                                                                               
           'cmdname' => 'chapter',
+                                                                               
           'extra' => {
+                                                                               
             'spaces_before_argument' => ' '
+                                                                               
           },
+                                                                               
           'structure' => {
+                                                                               
             'level' => 1,
+                                                                               
             'number' => 21
+                                                                               
           }
+                                                                               
         },
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
+                                                                               
         'spaces_before_argument' => ' '
+                                                                               
       },
+                                                                               
       'structure' => {
+                                                                               
         'node_next' => {
+                                                                               
           'cmdname' => 'node',
+                                                                               
           'extra' => {
+                                                                               
             'associated_section' => {
+                                                                               
               'cmdname' => 'chapter',
+                                                                               
               'extra' => {
+                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
               },
+                                                                               
               'structure' => {
+                                                                               
                 'level' => 1,
+                                                                               
                 'number' => 22
+                                                                               
               }
+                                                                               
             },
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
+                                                                               
             'spaces_before_argument' => ' '
+                                                                               
           },
+                                                                               
           'structure' => {
+                                                                               
             'node_next' => {
+                                                                               
               'cmdname' => 'node',
+                                                                               
               'extra' => {
+                                                                               
                 'associated_section' => {
+                                                                               
                   'cmdname' => 'chapter',
+                                                                               
                   'extra' => {
+                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                   },
+                                                                               
                   'structure' => {
+                                                                               
                     'level' => 1,
+                                                                               
                     'number' => 23
+                                                                               
                   }
+                                                                               
                 },
+                                                                               
                 'normalized' => '8_002e27in',
+                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
               },
+                                                                               
               'structure' => {
+                                                                               
                 'node_next' => {
+                                                                               
                   'cmdname' => 'node',
+                                                                               
                   'extra' => {
+                                                                               
                     'associated_section' => {
+                                                                               
                       'cmdname' => 'chapter',
+                                                                               
                       'extra' => {
+                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                       },
+                                                                               
                       'structure' => {
+                                                                               
                         'level' => 1,
+                                                                               
                         'number' => 24
+                                                                               
                       }
+                                                                               
                     },
+                                                                               
                     'normalized' => 'sansserif-slanted',
+                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                   },
+                                                                               
                   'structure' => {
+                                                                               
                     'node_next' => {
+                                                                               
                       'cmdname' => 'node',
+                                                                               
                       'extra' => {
+                                                                               
                         'associated_section' => {
+                                                                               
                           'cmdname' => 'chapter',
+                                                                               
                           'extra' => {
+                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                           },
+                                                                               
                           'structure' => {
+                                                                               
                             'level' => 1,
+                                                                               
                             'number' => 25
+                                                                               
                           }
+                                                                               
                         },
+                                                                               
                         'normalized' => 'indicateurl',
+                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                       },
+                                                                               
                       'structure' => {
+                                                                               
                         'node_next' => {
+                                                                               
                           'cmdname' => 'node',
+                                                                               
                           'extra' => {
+                                                                               
                             'associated_section' => {
+                                                                               
                               'cmdname' => 'chapter',
+                                                                               
                               'extra' => {
+                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                               },
+                                                                               
                               'structure' => {
+                                                                               
                                 'level' => 1,
+                                                                               
                                 'number' => 26
+                                                                               
                               }
+                                                                               
                             },
+                                                                               
                             'normalized' => 'gH-3rd',
+                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                           },
+                                                                               
                           'structure' => {
+                                                                               
                             'node_next' => {
+                                                                               
                               'cmdname' => 'node',
+                                                                               
                               'extra' => {
+                                                                               
                                 'associated_section' => {
+                                                                               
                                   'cmdname' => 'chapter',
+                                                                               
                                   'extra' => {
+                                                                               
                                     'spaces_before_argument' => ' '
+                                                                               
                                   },
+                                                                               
                                   'structure' => {
+                                                                               
                                     'level' => 1,
+                                                                               
                                     'number' => 27
+                                                                               
                                   }
+                                                                               
                                 },
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
+                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                               },
+                                                                               
                               'structure' => {
+                                                                               
                                 'node_prev' => {},
+                                                                               
                                 'node_up' => {}
+                                                                               
                               }
+                                                                               
                             },
+                                                                               
                             'node_prev' => {},
+                                                                               
                             'node_up' => {}
+                                                                               
                           }
+                                                                               
                         },
+                                                                               
                         'node_prev' => {},
+                                                                               
                         'node_up' => {}
+                                                                               
                       }
+                                                                               
                     },
+                                                                               
                     'node_prev' => {},
+                                                                               
                     'node_up' => {}
+                                                                               
                   }
+                                                                               
                 },
+                                                                               
                 'node_prev' => {},
+                                                                               
                 'node_up' => {}
+                                                                               
               }
+                                                                               
             },
+                                                                               
             'node_prev' => {},
+                                                                               
             'node_up' => {}
+                                                                               
           }
+                                                                               
         },
+                                                                               
         'node_prev' => {},
+                                                                               
         'node_up' => {}
+                                                                               
       }
+                                                                               
     },
+                                                                               
     'node_prev' => {},
+                                                                               
     'node_up' => {}
+                                                                               
   }
+                                                                               
 },
+                                                                               
 'node_prev' => {},
+                                                                               
 'node_up' => {}
+                                                                              }
+                                                                            },
+                                                                            
'node_prev' => {},
+                                                                            
'node_up' => {}
+                                                                          }
+                                                                        },
+                                                                        
'node_prev' => {},
+                                                                        
'node_up' => {}
+                                                                      }
+                                                                    },
+                                                                    
'node_prev' => {},
+                                                                    'node_up' 
=> {}
+                                                                  }
+                                                                },
+                                                                'node_prev' => 
{},
+                                                                'node_up' => {}
+                                                              }
+                                                            },
+                                                            'node_prev' => {},
+                                                            'node_up' => {}
+                                                          }
                                                         },
                                                         'node_prev' => {},
                                                         'node_up' => {}
-                                                      },
-                                                      'node_prev' => {},
-                                                      'node_up' => {}
+                                                      }
                                                     },
                                                     'node_prev' => {},
                                                     'node_up' => {}
-                                                  },
-                                                  'node_prev' => {},
-                                                  'node_up' => {}
+                                                  }
                                                 },
                                                 'node_prev' => {},
                                                 'node_up' => {}
-                                              },
-                                              'node_prev' => {},
-                                              'node_up' => {}
+                                              }
                                             },
                                             'node_prev' => {},
                                             'node_up' => {}
-                                          },
-                                          'node_prev' => {},
-                                          'node_up' => {}
+                                          }
                                         },
                                         'node_prev' => {},
                                         'node_up' => {}
-                                      },
-                                      'node_prev' => {},
-                                      'node_up' => {}
+                                      }
                                     },
                                     'node_prev' => {},
                                     'node_up' => {}
-                                  },
-                                  'node_prev' => {},
-                                  'node_up' => {}
+                                  }
                                 },
                                 'node_prev' => {},
                                 'node_up' => {}
-                              },
-                              'node_prev' => {},
-                              'node_up' => {}
+                              }
                             },
                             'node_prev' => {},
                             'node_up' => {}
-                          },
-                          'node_prev' => {},
-                          'node_up' => {}
+                          }
                         },
                         'node_prev' => {},
                         'node_up' => {}
-                      },
-                      'node_prev' => {},
-                      'node_up' => {}
+                      }
                     },
                     'node_prev' => {},
                     'node_up' => {}
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
+                  }
                 },
                 'node_prev' => {},
                 'node_up' => {}
-              },
-              'node_prev' => {},
-              'node_up' => {}
+              }
             },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next
 [...]
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs_latin1'}{'menu_child'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_prev'} = 
$result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_up'} = 
$result_nodes{'at_commands_in_refs_latin1'};
-$result_nodes{'at_commands_in_refs_latin1'}{'node_next'} = 
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'stru
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $re [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $resu [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_r [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs_latin1'}{'structure' [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure
 [...]
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_latin1'};
+$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'node_next'} = 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'};
 
 $result_menus{'at_commands_in_refs_latin1'} = {
   'cmdname' => 'node',
@@ -22517,178 +22629,299 @@ $result_menus{'at_commands_in_refs_latin1'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '-_007b-_007d',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '----_0021---_002e--_002e-_003f-_0040',
+        'normalized' => '-_007b-_007d',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_0040-_007b-_007d-_005c-_0023',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => '_2265-_2264-_2192',
+                'normalized' => '_0040-_007b-_007d-_005c-_0023',
                 'spaces_before_argument' => ' '
               },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                  'spaces_before_argument' => ' '
-                },
+              'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_21d2-_00b0-a-b--_00e5',
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
                     'spaces_before_argument' => ' '
                   },
-                  'menu_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                      'spaces_before_argument' => ' '
-                    },
+                  'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
                         'spaces_before_argument' => ' '
                       },
-                      'menu_next' => {
-                        'cmdname' => 'node',
-                        'extra' => {
-                          'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                          'spaces_before_argument' => ' '
-                        },
+                      'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => '_0131-_1e14-_1e08',
+                            'normalized' => '_2265-_2264-_2192',
                             'spaces_before_argument' => ' '
                           },
-                          'menu_next' => {
-                            'cmdname' => 'node',
-                            'extra' => {
-                              'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                              'spaces_before_argument' => ' '
-                            },
+                          'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
                                 'spaces_before_argument' => ' '
                               },
-                              'menu_next' => {
-                                'cmdname' => 'node',
-                                'extra' => {
-                                  'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                  'spaces_before_argument' => ' '
-                                },
+                              'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'AAA-AAA-BBB',
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
                                     'spaces_before_argument' => ' '
                                   },
-                                  'menu_next' => {
-                                    'cmdname' => 'node',
-                                    'extra' => {
-                                      'normalized' => 'CCC-CCC-DDD',
-                                      'spaces_before_argument' => ' '
-                                    },
+                                  'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
                                         'spaces_before_argument' => ' '
                                       },
-                                      'menu_next' => {
-                                        'cmdname' => 'node',
-                                        'extra' => {
-                                          'normalized' => 
'f_002d_002dile1-f_002d_002dile',
-                                          'spaces_before_argument' => ' '
-                                        },
+                                      'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 
'-_0040-_007b_007d-_002e-',
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
                                             'spaces_before_argument' => ' '
                                           },
-                                          'menu_next' => {
-                                            'cmdname' => 'node',
-                                            'extra' => {
-                                              'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                              'spaces_before_argument' => ' '
-                                            },
+                                          'structure' => {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
-                                                'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
                                                 'spaces_before_argument' => ' '
                                               },
-                                              'menu_next' => {
-                                                'cmdname' => 'node',
-                                                'extra' => {
-                                                  'normalized' => '8_002e27in',
-                                                  'spaces_before_argument' => 
' '
-                                                },
+                                              'structure' => {
                                                 'menu_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
-                                                    'normalized' => 
'sansserif-slanted',
+                                                    'normalized' => 
'_0131-_1e14-_1e08',
                                                     'spaces_before_argument' 
=> ' '
                                                   },
-                                                  'menu_next' => {
-                                                    'cmdname' => 'node',
-                                                    'extra' => {
-                                                      'normalized' => 
'indicateurl',
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                  'structure' => {
                                                     'menu_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
-                                                        'normalized' => 
'gH-3rd',
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
                                                         
'spaces_before_argument' => ' '
                                                       },
-                                                      'menu_next' => {
-                                                        'cmdname' => 'node',
-                                                        'extra' => {
-                                                          'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                          
'spaces_before_argument' => ' '
+                                                      'structure' => {
+                                                        'menu_next' => {
+                                                          'cmdname' => 'node',
+                                                          'extra' => {
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                                            
'spaces_before_argument' => ' '
+                                                          },
+                                                          'structure' => {
+                                                            'menu_next' => {
+                                                              'cmdname' => 
'node',
+                                                              'extra' => {
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
+                                                                
'spaces_before_argument' => ' '
+                                                              },
+                                                              'structure' => {
+                                                                'menu_next' => 
{
+                                                                  'cmdname' => 
'node',
+                                                                  'extra' => {
+                                                                    
'normalized' => 'AAA-AAA-BBB',
+                                                                    
'spaces_before_argument' => ' '
+                                                                  },
+                                                                  'structure' 
=> {
+                                                                    
'menu_next' => {
+                                                                      
'cmdname' => 'node',
+                                                                      'extra' 
=> {
+                                                                        
'normalized' => 'CCC-CCC-DDD',
+                                                                        
'spaces_before_argument' => ' '
+                                                                      },
+                                                                      
'structure' => {
+                                                                        
'menu_next' => {
+                                                                          
'cmdname' => 'node',
+                                                                          
'extra' => {
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
+                                                                            
'spaces_before_argument' => ' '
+                                                                          },
+                                                                          
'structure' => {
+                                                                            
'menu_next' => {
+                                                                              
'cmdname' => 'node',
+                                                                              
'extra' => {
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
+                                                                               
 'spaces_before_argument' => ' '
+                                                                              
},
+                                                                              
'structure' => {
+                                                                               
 'menu_next' => {
+                                                                               
   'cmdname' => 'node',
+                                                                               
   'extra' => {
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
+                                                                               
     'spaces_before_argument' => ' '
+                                                                               
   },
+                                                                               
   'structure' => {
+                                                                               
     'menu_next' => {
+                                                                               
       'cmdname' => 'node',
+                                                                               
       'extra' => {
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
+                                                                               
         'spaces_before_argument' => ' '
+                                                                               
       },
+                                                                               
       'structure' => {
+                                                                               
         'menu_next' => {
+                                                                               
           'cmdname' => 'node',
+                                                                               
           'extra' => {
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
+                                                                               
             'spaces_before_argument' => ' '
+                                                                               
           },
+                                                                               
           'structure' => {
+                                                                               
             'menu_next' => {
+                                                                               
               'cmdname' => 'node',
+                                                                               
               'extra' => {
+                                                                               
                 'normalized' => '8_002e27in',
+                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
               },
+                                                                               
               'structure' => {
+                                                                               
                 'menu_next' => {
+                                                                               
                   'cmdname' => 'node',
+                                                                               
                   'extra' => {
+                                                                               
                     'normalized' => 'sansserif-slanted',
+                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                   },
+                                                                               
                   'structure' => {
+                                                                               
                     'menu_next' => {
+                                                                               
                       'cmdname' => 'node',
+                                                                               
                       'extra' => {
+                                                                               
                         'normalized' => 'indicateurl',
+                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                       },
+                                                                               
                       'structure' => {
+                                                                               
                         'menu_next' => {
+                                                                               
                           'cmdname' => 'node',
+                                                                               
                           'extra' => {
+                                                                               
                             'normalized' => 'gH-3rd',
+                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                           },
+                                                                               
                           'structure' => {
+                                                                               
                             'menu_next' => {
+                                                                               
                               'cmdname' => 'node',
+                                                                               
                               'extra' => {
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
+                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                               },
+                                                                               
                               'structure' => {
+                                                                               
                                 'menu_prev' => {},
+                                                                               
                                 'menu_up' => {},
+                                                                               
                                 'menu_up_hash' => {
+                                                                               
                                   'Top' => 1
+                                                                               
                                 }
+                                                                               
                               }
+                                                                               
                             },
+                                                                               
                             'menu_prev' => {},
+                                                                               
                             'menu_up' => {},
+                                                                               
                             'menu_up_hash' => {
+                                                                               
                               'Top' => 1
+                                                                               
                             }
+                                                                               
                           }
+                                                                               
                         },
+                                                                               
                         'menu_prev' => {},
+                                                                               
                         'menu_up' => {},
+                                                                               
                         'menu_up_hash' => {
+                                                                               
                           'Top' => 1
+                                                                               
                         }
+                                                                               
                       }
+                                                                               
                     },
+                                                                               
                     'menu_prev' => {},
+                                                                               
                     'menu_up' => {},
+                                                                               
                     'menu_up_hash' => {
+                                                                               
                       'Top' => 1
+                                                                               
                     }
+                                                                               
                   }
+                                                                               
                 },
+                                                                               
                 'menu_prev' => {},
+                                                                               
                 'menu_up' => {},
+                                                                               
                 'menu_up_hash' => {
+                                                                               
                   'Top' => 1
+                                                                               
                 }
+                                                                               
               }
+                                                                               
             },
+                                                                               
             'menu_prev' => {},
+                                                                               
             'menu_up' => {},
+                                                                               
             'menu_up_hash' => {
+                                                                               
               'Top' => 1
+                                                                               
             }
+                                                                               
           }
+                                                                               
         },
+                                                                               
         'menu_prev' => {},
+                                                                               
         'menu_up' => {},
+                                                                               
         'menu_up_hash' => {
+                                                                               
           'Top' => 1
+                                                                               
         }
+                                                                               
       }
+                                                                               
     },
+                                                                               
     'menu_prev' => {},
+                                                                               
     'menu_up' => {},
+                                                                               
     'menu_up_hash' => {
+                                                                               
       'Top' => 1
+                                                                               
     }
+                                                                               
   }
+                                                                               
 },
+                                                                               
 'menu_prev' => {},
+                                                                               
 'menu_up' => {},
+                                                                               
 'menu_up_hash' => {
+                                                                               
   'Top' => 1
+                                                                               
 }
+                                                                              }
+                                                                            },
+                                                                            
'menu_prev' => {},
+                                                                            
'menu_up' => {},
+                                                                            
'menu_up_hash' => {
+                                                                              
'Top' => 1
+                                                                            }
+                                                                          }
+                                                                        },
+                                                                        
'menu_prev' => {},
+                                                                        
'menu_up' => {},
+                                                                        
'menu_up_hash' => {
+                                                                          
'Top' => 1
+                                                                        }
+                                                                      }
+                                                                    },
+                                                                    
'menu_prev' => {},
+                                                                    'menu_up' 
=> {},
+                                                                    
'menu_up_hash' => {
+                                                                      'Top' => 
1
+                                                                    }
+                                                                  }
+                                                                },
+                                                                'menu_prev' => 
{},
+                                                                'menu_up' => 
{},
+                                                                'menu_up_hash' 
=> {
+                                                                  'Top' => 1
+                                                                }
+                                                              }
+                                                            },
+                                                            'menu_prev' => {},
+                                                            'menu_up' => {},
+                                                            'menu_up_hash' => {
+                                                              'Top' => 1
+                                                            }
+                                                          }
                                                         },
                                                         'menu_prev' => {},
                                                         'menu_up' => {},
                                                         'menu_up_hash' => {
                                                           'Top' => 1
                                                         }
-                                                      },
-                                                      'menu_prev' => {},
-                                                      'menu_up' => {},
-                                                      'menu_up_hash' => {
-                                                        'Top' => 1
                                                       }
                                                     },
                                                     'menu_prev' => {},
@@ -22696,11 +22929,6 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                                                     'menu_up_hash' => {
                                                       'Top' => 1
                                                     }
-                                                  },
-                                                  'menu_prev' => {},
-                                                  'menu_up' => {},
-                                                  'menu_up_hash' => {
-                                                    'Top' => 1
                                                   }
                                                 },
                                                 'menu_prev' => {},
@@ -22708,11 +22936,6 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                                                 'menu_up_hash' => {
                                                   'Top' => 1
                                                 }
-                                              },
-                                              'menu_prev' => {},
-                                              'menu_up' => {},
-                                              'menu_up_hash' => {
-                                                'Top' => 1
                                               }
                                             },
                                             'menu_prev' => {},
@@ -22720,11 +22943,6 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                                             'menu_up_hash' => {
                                               'Top' => 1
                                             }
-                                          },
-                                          'menu_prev' => {},
-                                          'menu_up' => {},
-                                          'menu_up_hash' => {
-                                            'Top' => 1
                                           }
                                         },
                                         'menu_prev' => {},
@@ -22732,11 +22950,6 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                                         'menu_up_hash' => {
                                           'Top' => 1
                                         }
-                                      },
-                                      'menu_prev' => {},
-                                      'menu_up' => {},
-                                      'menu_up_hash' => {
-                                        'Top' => 1
                                       }
                                     },
                                     'menu_prev' => {},
@@ -22744,11 +22957,6 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                                     'menu_up_hash' => {
                                       'Top' => 1
                                     }
-                                  },
-                                  'menu_prev' => {},
-                                  'menu_up' => {},
-                                  'menu_up_hash' => {
-                                    'Top' => 1
                                   }
                                 },
                                 'menu_prev' => {},
@@ -22756,11 +22964,6 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                                 'menu_up_hash' => {
                                   'Top' => 1
                                 }
-                              },
-                              'menu_prev' => {},
-                              'menu_up' => {},
-                              'menu_up_hash' => {
-                                'Top' => 1
                               }
                             },
                             'menu_prev' => {},
@@ -22768,11 +22971,6 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                             'menu_up_hash' => {
                               'Top' => 1
                             }
-                          },
-                          'menu_prev' => {},
-                          'menu_up' => {},
-                          'menu_up_hash' => {
-                            'Top' => 1
                           }
                         },
                         'menu_prev' => {},
@@ -22780,11 +22978,6 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                         'menu_up_hash' => {
                           'Top' => 1
                         }
-                      },
-                      'menu_prev' => {},
-                      'menu_up' => {},
-                      'menu_up_hash' => {
-                        'Top' => 1
                       }
                     },
                     'menu_prev' => {},
@@ -22792,11 +22985,6 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                     'menu_up_hash' => {
                       'Top' => 1
                     }
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'Top' => 1
                   }
                 },
                 'menu_prev' => {},
@@ -22804,11 +22992,6 @@ $result_menus{'at_commands_in_refs_latin1'} = {
                 'menu_up_hash' => {
                   'Top' => 1
                 }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'Top' => 1
               }
             },
             'menu_prev' => {},
@@ -22816,84 +22999,69 @@ $result_menus{'at_commands_in_refs_latin1'} = {
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next
 [...]
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs_latin1'}{'menu_child'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
-$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_up'} = 
$result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'stru
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $re [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $resu [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'at_commands_in [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_r [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs_latin1'}{'structure' [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure
 [...]
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
+$result_menus{'at_commands_in_refs_latin1'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
 
 $result_errors{'at_commands_in_refs_latin1'} = [
   {
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
index 541a94ad70..02ecca2fea 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
@@ -118,7 +118,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4899,7 +4900,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5092,7 +5094,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 40,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5350,7 +5353,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 43,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5691,7 +5695,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 46,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6049,7 +6054,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 49,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6311,7 +6317,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 52,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6610,7 +6617,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 55,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6943,7 +6951,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 58,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -7459,7 +7468,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 61,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -8162,7 +8172,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 64,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -8737,7 +8748,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9106,7 +9118,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 70,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9431,7 +9444,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 73,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9768,7 +9782,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 76,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -9967,7 +9982,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 79,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10145,7 +10161,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 82,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10412,7 +10429,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 85,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10659,7 +10677,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 90,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -10907,7 +10926,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 93,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -11100,7 +11120,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 98,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -11513,7 +11534,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 103,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12092,7 +12114,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 106,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12393,7 +12416,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 109,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12544,7 +12568,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 112,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12687,7 +12712,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 115,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -12834,7 +12860,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 118,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -13065,7 +13092,8 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 121,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -21221,7 +21249,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -21236,7 +21265,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '-_007b-_007d',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21256,7 +21286,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '----_0021---_002e--_002e-_003f-_0040',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21277,7 +21308,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_0040-_007b-_007d-_005c-_0023',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21298,7 +21330,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21319,7 +21352,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21340,7 +21374,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_2265-_2264-_2192',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21361,7 +21396,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21382,7 +21418,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_21d2-_00b0-a-b--_00e5',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21403,7 +21440,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21424,7 +21462,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => '  '
               },
@@ -21445,7 +21484,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21466,7 +21506,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_0131-_1e14-_1e08',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21487,7 +21528,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21508,7 +21550,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21529,7 +21572,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21550,7 +21594,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'AAA-AAA-BBB',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21571,7 +21616,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'CCC-CCC-DDD',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21592,7 +21638,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21613,7 +21660,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'f_002d_002dile1-f_002d_002dile',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21634,7 +21682,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '-_0040-_007b_007d-_002e-',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21655,7 +21704,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21676,7 +21726,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21697,7 +21748,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => '8_002e27in',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21718,7 +21770,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'sansserif-slanted',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21739,7 +21792,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'indicateurl',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21760,7 +21814,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 'gH-3rd',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21781,7 +21836,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -21925,23 +21981,23 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => '-_007b-_007d',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -21951,28 +22007,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => '----_0021---_002e--_002e-_003f-_0040',
+        'normalized' => '-_007b-_007d',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
-          },
-          'normalized' => '_0040-_007b-_007d-_005c-_0023',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
@@ -21983,28 +22024,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
               },
               'structure' => {
                 'level' => 1,
-                'number' => 4
+                'number' => 2
               }
             },
-            'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 1,
-                  'number' => 5
-                }
-              },
-              'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
@@ -22015,28 +22041,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                   },
                   'structure' => {
                     'level' => 1,
-                    'number' => 6
+                    'number' => 3
                   }
                 },
-                'normalized' => '_2265-_2264-_2192',
+                'normalized' => '_0040-_007b-_007d-_005c-_0023',
                 'spaces_before_argument' => ' '
               },
-              'node_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 1,
-                      'number' => 7
-                    }
-                  },
-                  'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                  'spaces_before_argument' => ' '
-                },
+              'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
@@ -22047,60 +22058,30 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                       },
                       'structure' => {
                         'level' => 1,
-                        'number' => 8
+                        'number' => 4
                       }
                     },
-                    'normalized' => '_21d2-_00b0-a-b--_00e5',
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
                     'spaces_before_argument' => ' '
                   },
-                  'node_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 1,
-                          'number' => 9
-                        }
-                      },
-                      'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                      'spaces_before_argument' => ' '
-                    },
+                  'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'spaces_before_argument' => '  '
+                            'spaces_before_argument' => ' '
                           },
                           'structure' => {
                             'level' => 1,
-                            'number' => 10
+                            'number' => 5
                           }
                         },
-                        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
                         'spaces_before_argument' => ' '
                       },
-                      'node_next' => {
-                        'cmdname' => 'node',
-                        'extra' => {
-                          'associated_section' => {
-                            'cmdname' => 'chapter',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
-                            'structure' => {
-                              'level' => 1,
-                              'number' => 11
-                            }
-                          },
-                          'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                          'spaces_before_argument' => ' '
-                        },
+                      'structure' => {
                         'node_next' => {
                           'cmdname' => 'node',
                           'extra' => {
@@ -22111,28 +22092,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                               },
                               'structure' => {
                                 'level' => 1,
-                                'number' => 12
+                                'number' => 6
                               }
                             },
-                            'normalized' => '_0131-_1e14-_1e08',
+                            'normalized' => '_2265-_2264-_2192',
                             'spaces_before_argument' => ' '
                           },
-                          'node_next' => {
-                            'cmdname' => 'node',
-                            'extra' => {
-                              'associated_section' => {
-                                'cmdname' => 'chapter',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
-                                'structure' => {
-                                  'level' => 1,
-                                  'number' => 13
-                                }
-                              },
-                              'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                              'spaces_before_argument' => ' '
-                            },
+                          'structure' => {
                             'node_next' => {
                               'cmdname' => 'node',
                               'extra' => {
@@ -22143,28 +22109,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                   },
                                   'structure' => {
                                     'level' => 1,
-                                    'number' => 14
+                                    'number' => 7
                                   }
                                 },
-                                'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
                                 'spaces_before_argument' => ' '
                               },
-                              'node_next' => {
-                                'cmdname' => 'node',
-                                'extra' => {
-                                  'associated_section' => {
-                                    'cmdname' => 'chapter',
-                                    'extra' => {
-                                      'spaces_before_argument' => ' '
-                                    },
-                                    'structure' => {
-                                      'level' => 1,
-                                      'number' => 15
-                                    }
-                                  },
-                                  'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                  'spaces_before_argument' => ' '
-                                },
+                              'structure' => {
                                 'node_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
@@ -22175,28 +22126,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                       },
                                       'structure' => {
                                         'level' => 1,
-                                        'number' => 16
+                                        'number' => 8
                                       }
                                     },
-                                    'normalized' => 'AAA-AAA-BBB',
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
                                     'spaces_before_argument' => ' '
                                   },
-                                  'node_next' => {
-                                    'cmdname' => 'node',
-                                    'extra' => {
-                                      'associated_section' => {
-                                        'cmdname' => 'chapter',
-                                        'extra' => {
-                                          'spaces_before_argument' => ' '
-                                        },
-                                        'structure' => {
-                                          'level' => 1,
-                                          'number' => 17
-                                        }
-                                      },
-                                      'normalized' => 'CCC-CCC-DDD',
-                                      'spaces_before_argument' => ' '
-                                    },
+                                  'structure' => {
                                     'node_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
@@ -22207,60 +22143,30 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                           },
                                           'structure' => {
                                             'level' => 1,
-                                            'number' => 18
+                                            'number' => 9
                                           }
                                         },
-                                        'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
                                         'spaces_before_argument' => ' '
                                       },
-                                      'node_next' => {
-                                        'cmdname' => 'node',
-                                        'extra' => {
-                                          'associated_section' => {
-                                            'cmdname' => 'chapter',
-                                            'extra' => {
-                                              'spaces_before_argument' => ' '
-                                            },
-                                            'structure' => {
-                                              'level' => 1,
-                                              'number' => 19
-                                            }
-                                          },
-                                          'normalized' => 
'f_002d_002dile1-f_002d_002dile',
-                                          'spaces_before_argument' => ' '
-                                        },
+                                      'structure' => {
                                         'node_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
                                               'extra' => {
-                                                'spaces_before_argument' => ' '
+                                                'spaces_before_argument' => '  
'
                                               },
                                               'structure' => {
                                                 'level' => 1,
-                                                'number' => 20
+                                                'number' => 10
                                               }
                                             },
-                                            'normalized' => 
'-_0040-_007b_007d-_002e-',
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
                                             'spaces_before_argument' => ' '
                                           },
-                                          'node_next' => {
-                                            'cmdname' => 'node',
-                                            'extra' => {
-                                              'associated_section' => {
-                                                'cmdname' => 'chapter',
-                                                'extra' => {
-                                                  'spaces_before_argument' => 
' '
-                                                },
-                                                'structure' => {
-                                                  'level' => 1,
-                                                  'number' => 21
-                                                }
-                                              },
-                                              'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                              'spaces_before_argument' => ' '
-                                            },
+                                          'structure' => {
                                             'node_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
@@ -22271,28 +22177,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                   },
                                                   'structure' => {
                                                     'level' => 1,
-                                                    'number' => 22
+                                                    'number' => 11
                                                   }
                                                 },
-                                                'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
                                                 'spaces_before_argument' => ' '
                                               },
-                                              'node_next' => {
-                                                'cmdname' => 'node',
-                                                'extra' => {
-                                                  'associated_section' => {
-                                                    'cmdname' => 'chapter',
-                                                    'extra' => {
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
-                                                    'structure' => {
-                                                      'level' => 1,
-                                                      'number' => 23
-                                                    }
-                                                  },
-                                                  'normalized' => '8_002e27in',
-                                                  'spaces_before_argument' => 
' '
-                                                },
+                                              'structure' => {
                                                 'node_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
@@ -22303,28 +22194,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                       },
                                                       'structure' => {
                                                         'level' => 1,
-                                                        'number' => 24
+                                                        'number' => 12
                                                       }
                                                     },
-                                                    'normalized' => 
'sansserif-slanted',
+                                                    'normalized' => 
'_0131-_1e14-_1e08',
                                                     'spaces_before_argument' 
=> ' '
                                                   },
-                                                  'node_next' => {
-                                                    'cmdname' => 'node',
-                                                    'extra' => {
-                                                      'associated_section' => {
-                                                        'cmdname' => 'chapter',
-                                                        'extra' => {
-                                                          
'spaces_before_argument' => ' '
-                                                        },
-                                                        'structure' => {
-                                                          'level' => 1,
-                                                          'number' => 25
-                                                        }
-                                                      },
-                                                      'normalized' => 
'indicateurl',
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                  'structure' => {
                                                     'node_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
@@ -22335,181 +22211,417 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                           },
                                                           'structure' => {
                                                             'level' => 1,
-                                                            'number' => 26
+                                                            'number' => 13
                                                           }
                                                         },
-                                                        'normalized' => 
'gH-3rd',
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
                                                         
'spaces_before_argument' => ' '
                                                       },
-                                                      'node_next' => {
-                                                        'cmdname' => 'node',
-                                                        'extra' => {
-                                                          'associated_section' 
=> {
-                                                            'cmdname' => 
'chapter',
-                                                            'extra' => {
-                                                              
'spaces_before_argument' => ' '
+                                                      'structure' => {
+                                                        'node_next' => {
+                                                          'cmdname' => 'node',
+                                                          'extra' => {
+                                                            
'associated_section' => {
+                                                              'cmdname' => 
'chapter',
+                                                              'extra' => {
+                                                                
'spaces_before_argument' => ' '
+                                                              },
+                                                              'structure' => {
+                                                                'level' => 1,
+                                                                'number' => 14
+                                                              }
                                                             },
-                                                            'structure' => {
-                                                              'level' => 1,
-                                                              'number' => 27
-                                                            }
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                                            
'spaces_before_argument' => ' '
                                                           },
-                                                          'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                          
'spaces_before_argument' => ' '
+                                                          'structure' => {
+                                                            'node_next' => {
+                                                              'cmdname' => 
'node',
+                                                              'extra' => {
+                                                                
'associated_section' => {
+                                                                  'cmdname' => 
'chapter',
+                                                                  'extra' => {
+                                                                    
'spaces_before_argument' => ' '
+                                                                  },
+                                                                  'structure' 
=> {
+                                                                    'level' => 
1,
+                                                                    'number' 
=> 15
+                                                                  }
+                                                                },
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
+                                                                
'spaces_before_argument' => ' '
+                                                              },
+                                                              'structure' => {
+                                                                'node_next' => 
{
+                                                                  'cmdname' => 
'node',
+                                                                  'extra' => {
+                                                                    
'associated_section' => {
+                                                                      
'cmdname' => 'chapter',
+                                                                      'extra' 
=> {
+                                                                        
'spaces_before_argument' => ' '
+                                                                      },
+                                                                      
'structure' => {
+                                                                        
'level' => 1,
+                                                                        
'number' => 16
+                                                                      }
+                                                                    },
+                                                                    
'normalized' => 'AAA-AAA-BBB',
+                                                                    
'spaces_before_argument' => ' '
+                                                                  },
+                                                                  'structure' 
=> {
+                                                                    
'node_next' => {
+                                                                      
'cmdname' => 'node',
+                                                                      'extra' 
=> {
+                                                                        
'associated_section' => {
+                                                                          
'cmdname' => 'chapter',
+                                                                          
'extra' => {
+                                                                            
'spaces_before_argument' => ' '
+                                                                          },
+                                                                          
'structure' => {
+                                                                            
'level' => 1,
+                                                                            
'number' => 17
+                                                                          }
+                                                                        },
+                                                                        
'normalized' => 'CCC-CCC-DDD',
+                                                                        
'spaces_before_argument' => ' '
+                                                                      },
+                                                                      
'structure' => {
+                                                                        
'node_next' => {
+                                                                          
'cmdname' => 'node',
+                                                                          
'extra' => {
+                                                                            
'associated_section' => {
+                                                                              
'cmdname' => 'chapter',
+                                                                              
'extra' => {
+                                                                               
 'spaces_before_argument' => ' '
+                                                                              
},
+                                                                              
'structure' => {
+                                                                               
 'level' => 1,
+                                                                               
 'number' => 18
+                                                                              }
+                                                                            },
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
+                                                                            
'spaces_before_argument' => ' '
+                                                                          },
+                                                                          
'structure' => {
+                                                                            
'node_next' => {
+                                                                              
'cmdname' => 'node',
+                                                                              
'extra' => {
+                                                                               
 'associated_section' => {
+                                                                               
   'cmdname' => 'chapter',
+                                                                               
   'extra' => {
+                                                                               
     'spaces_before_argument' => ' '
+                                                                               
   },
+                                                                               
   'structure' => {
+                                                                               
     'level' => 1,
+                                                                               
     'number' => 19
+                                                                               
   }
+                                                                               
 },
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
+                                                                               
 'spaces_before_argument' => ' '
+                                                                              
},
+                                                                              
'structure' => {
+                                                                               
 'node_next' => {
+                                                                               
   'cmdname' => 'node',
+                                                                               
   'extra' => {
+                                                                               
     'associated_section' => {
+                                                                               
       'cmdname' => 'chapter',
+                                                                               
       'extra' => {
+                                                                               
         'spaces_before_argument' => ' '
+                                                                               
       },
+                                                                               
       'structure' => {
+                                                                               
         'level' => 1,
+                                                                               
         'number' => 20
+                                                                               
       }
+                                                                               
     },
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
+                                                                               
     'spaces_before_argument' => ' '
+                                                                               
   },
+                                                                               
   'structure' => {
+                                                                               
     'node_next' => {
+                                                                               
       'cmdname' => 'node',
+                                                                               
       'extra' => {
+                                                                               
         'associated_section' => {
+                                                                               
           'cmdname' => 'chapter',
+                                                                               
           'extra' => {
+                                                                               
             'spaces_before_argument' => ' '
+                                                                               
           },
+                                                                               
           'structure' => {
+                                                                               
             'level' => 1,
+                                                                               
             'number' => 21
+                                                                               
           }
+                                                                               
         },
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
+                                                                               
         'spaces_before_argument' => ' '
+                                                                               
       },
+                                                                               
       'structure' => {
+                                                                               
         'node_next' => {
+                                                                               
           'cmdname' => 'node',
+                                                                               
           'extra' => {
+                                                                               
             'associated_section' => {
+                                                                               
               'cmdname' => 'chapter',
+                                                                               
               'extra' => {
+                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
               },
+                                                                               
               'structure' => {
+                                                                               
                 'level' => 1,
+                                                                               
                 'number' => 22
+                                                                               
               }
+                                                                               
             },
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
+                                                                               
             'spaces_before_argument' => ' '
+                                                                               
           },
+                                                                               
           'structure' => {
+                                                                               
             'node_next' => {
+                                                                               
               'cmdname' => 'node',
+                                                                               
               'extra' => {
+                                                                               
                 'associated_section' => {
+                                                                               
                   'cmdname' => 'chapter',
+                                                                               
                   'extra' => {
+                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                   },
+                                                                               
                   'structure' => {
+                                                                               
                     'level' => 1,
+                                                                               
                     'number' => 23
+                                                                               
                   }
+                                                                               
                 },
+                                                                               
                 'normalized' => '8_002e27in',
+                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
               },
+                                                                               
               'structure' => {
+                                                                               
                 'node_next' => {
+                                                                               
                   'cmdname' => 'node',
+                                                                               
                   'extra' => {
+                                                                               
                     'associated_section' => {
+                                                                               
                       'cmdname' => 'chapter',
+                                                                               
                       'extra' => {
+                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                       },
+                                                                               
                       'structure' => {
+                                                                               
                         'level' => 1,
+                                                                               
                         'number' => 24
+                                                                               
                       }
+                                                                               
                     },
+                                                                               
                     'normalized' => 'sansserif-slanted',
+                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                   },
+                                                                               
                   'structure' => {
+                                                                               
                     'node_next' => {
+                                                                               
                       'cmdname' => 'node',
+                                                                               
                       'extra' => {
+                                                                               
                         'associated_section' => {
+                                                                               
                           'cmdname' => 'chapter',
+                                                                               
                           'extra' => {
+                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                           },
+                                                                               
                           'structure' => {
+                                                                               
                             'level' => 1,
+                                                                               
                             'number' => 25
+                                                                               
                           }
+                                                                               
                         },
+                                                                               
                         'normalized' => 'indicateurl',
+                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                       },
+                                                                               
                       'structure' => {
+                                                                               
                         'node_next' => {
+                                                                               
                           'cmdname' => 'node',
+                                                                               
                           'extra' => {
+                                                                               
                             'associated_section' => {
+                                                                               
                               'cmdname' => 'chapter',
+                                                                               
                               'extra' => {
+                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                               },
+                                                                               
                               'structure' => {
+                                                                               
                                 'level' => 1,
+                                                                               
                                 'number' => 26
+                                                                               
                               }
+                                                                               
                             },
+                                                                               
                             'normalized' => 'gH-3rd',
+                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                           },
+                                                                               
                           'structure' => {
+                                                                               
                             'node_next' => {
+                                                                               
                               'cmdname' => 'node',
+                                                                               
                               'extra' => {
+                                                                               
                                 'associated_section' => {
+                                                                               
                                   'cmdname' => 'chapter',
+                                                                               
                                   'extra' => {
+                                                                               
                                     'spaces_before_argument' => ' '
+                                                                               
                                   },
+                                                                               
                                   'structure' => {
+                                                                               
                                     'level' => 1,
+                                                                               
                                     'number' => 27
+                                                                               
                                   }
+                                                                               
                                 },
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
+                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                               },
+                                                                               
                               'structure' => {
+                                                                               
                                 'node_prev' => {},
+                                                                               
                                 'node_up' => {}
+                                                                               
                               }
+                                                                               
                             },
+                                                                               
                             'node_prev' => {},
+                                                                               
                             'node_up' => {}
+                                                                               
                           }
+                                                                               
                         },
+                                                                               
                         'node_prev' => {},
+                                                                               
                         'node_up' => {}
+                                                                               
                       }
+                                                                               
                     },
+                                                                               
                     'node_prev' => {},
+                                                                               
                     'node_up' => {}
+                                                                               
                   }
+                                                                               
                 },
+                                                                               
                 'node_prev' => {},
+                                                                               
                 'node_up' => {}
+                                                                               
               }
+                                                                               
             },
+                                                                               
             'node_prev' => {},
+                                                                               
             'node_up' => {}
+                                                                               
           }
+                                                                               
         },
+                                                                               
         'node_prev' => {},
+                                                                               
         'node_up' => {}
+                                                                               
       }
+                                                                               
     },
+                                                                               
     'node_prev' => {},
+                                                                               
     'node_up' => {}
+                                                                               
   }
+                                                                               
 },
+                                                                               
 'node_prev' => {},
+                                                                               
 'node_up' => {}
+                                                                              }
+                                                                            },
+                                                                            
'node_prev' => {},
+                                                                            
'node_up' => {}
+                                                                          }
+                                                                        },
+                                                                        
'node_prev' => {},
+                                                                        
'node_up' => {}
+                                                                      }
+                                                                    },
+                                                                    
'node_prev' => {},
+                                                                    'node_up' 
=> {}
+                                                                  }
+                                                                },
+                                                                'node_prev' => 
{},
+                                                                'node_up' => {}
+                                                              }
+                                                            },
+                                                            'node_prev' => {},
+                                                            'node_up' => {}
+                                                          }
                                                         },
                                                         'node_prev' => {},
                                                         'node_up' => {}
-                                                      },
-                                                      'node_prev' => {},
-                                                      'node_up' => {}
+                                                      }
                                                     },
                                                     'node_prev' => {},
                                                     'node_up' => {}
-                                                  },
-                                                  'node_prev' => {},
-                                                  'node_up' => {}
+                                                  }
                                                 },
                                                 'node_prev' => {},
                                                 'node_up' => {}
-                                              },
-                                              'node_prev' => {},
-                                              'node_up' => {}
+                                              }
                                             },
                                             'node_prev' => {},
                                             'node_up' => {}
-                                          },
-                                          'node_prev' => {},
-                                          'node_up' => {}
+                                          }
                                         },
                                         'node_prev' => {},
                                         'node_up' => {}
-                                      },
-                                      'node_prev' => {},
-                                      'node_up' => {}
+                                      }
                                     },
                                     'node_prev' => {},
                                     'node_up' => {}
-                                  },
-                                  'node_prev' => {},
-                                  'node_up' => {}
+                                  }
                                 },
                                 'node_prev' => {},
                                 'node_up' => {}
-                              },
-                              'node_prev' => {},
-                              'node_up' => {}
+                              }
                             },
                             'node_prev' => {},
                             'node_up' => {}
-                          },
-                          'node_prev' => {},
-                          'node_up' => {}
+                          }
                         },
                         'node_prev' => {},
                         'node_up' => {}
-                      },
-                      'node_prev' => {},
-                      'node_up' => {}
+                      }
                     },
                     'node_prev' => {},
                     'node_up' => {}
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
+                  }
                 },
                 'node_prev' => {},
                 'node_up' => {}
-              },
-              'node_prev' => {},
-              'node_up' => {}
+              }
             },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'
 [...]
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs_utf8'}{'menu_child'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_prev'} = 
$result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_up'} = 
$result_nodes{'at_commands_in_refs_utf8'};
-$result_nodes{'at_commands_in_refs_utf8'}{'node_next'} = 
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'struct
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $resu [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_r [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_ref [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'m [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'
 [...]
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'at_commands_in_refs_utf8'};
+$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'node_next'} = 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'};
 
 $result_menus{'at_commands_in_refs_utf8'} = {
   'cmdname' => 'node',
@@ -22517,178 +22629,299 @@ $result_menus{'at_commands_in_refs_utf8'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '-_007b-_007d',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '----_0021---_002e--_002e-_003f-_0040',
+        'normalized' => '-_007b-_007d',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_0040-_007b-_007d-_005c-_0023',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => '_2265-_2264-_2192',
+                'normalized' => '_0040-_007b-_007d-_005c-_0023',
                 'spaces_before_argument' => ' '
               },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                  'spaces_before_argument' => ' '
-                },
+              'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_21d2-_00b0-a-b--_00e5',
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
                     'spaces_before_argument' => ' '
                   },
-                  'menu_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                      'spaces_before_argument' => ' '
-                    },
+                  'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
                         'spaces_before_argument' => ' '
                       },
-                      'menu_next' => {
-                        'cmdname' => 'node',
-                        'extra' => {
-                          'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                          'spaces_before_argument' => ' '
-                        },
+                      'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => '_0131-_1e14-_1e08',
+                            'normalized' => '_2265-_2264-_2192',
                             'spaces_before_argument' => ' '
                           },
-                          'menu_next' => {
-                            'cmdname' => 'node',
-                            'extra' => {
-                              'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                              'spaces_before_argument' => ' '
-                            },
+                          'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
                                 'spaces_before_argument' => ' '
                               },
-                              'menu_next' => {
-                                'cmdname' => 'node',
-                                'extra' => {
-                                  'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                  'spaces_before_argument' => ' '
-                                },
+                              'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'AAA-AAA-BBB',
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
                                     'spaces_before_argument' => ' '
                                   },
-                                  'menu_next' => {
-                                    'cmdname' => 'node',
-                                    'extra' => {
-                                      'normalized' => 'CCC-CCC-DDD',
-                                      'spaces_before_argument' => ' '
-                                    },
+                                  'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
                                         'spaces_before_argument' => ' '
                                       },
-                                      'menu_next' => {
-                                        'cmdname' => 'node',
-                                        'extra' => {
-                                          'normalized' => 
'f_002d_002dile1-f_002d_002dile',
-                                          'spaces_before_argument' => ' '
-                                        },
+                                      'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 
'-_0040-_007b_007d-_002e-',
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
                                             'spaces_before_argument' => ' '
                                           },
-                                          'menu_next' => {
-                                            'cmdname' => 'node',
-                                            'extra' => {
-                                              'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                              'spaces_before_argument' => ' '
-                                            },
+                                          'structure' => {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
-                                                'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
                                                 'spaces_before_argument' => ' '
                                               },
-                                              'menu_next' => {
-                                                'cmdname' => 'node',
-                                                'extra' => {
-                                                  'normalized' => '8_002e27in',
-                                                  'spaces_before_argument' => 
' '
-                                                },
+                                              'structure' => {
                                                 'menu_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
-                                                    'normalized' => 
'sansserif-slanted',
+                                                    'normalized' => 
'_0131-_1e14-_1e08',
                                                     'spaces_before_argument' 
=> ' '
                                                   },
-                                                  'menu_next' => {
-                                                    'cmdname' => 'node',
-                                                    'extra' => {
-                                                      'normalized' => 
'indicateurl',
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                  'structure' => {
                                                     'menu_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
-                                                        'normalized' => 
'gH-3rd',
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
                                                         
'spaces_before_argument' => ' '
                                                       },
-                                                      'menu_next' => {
-                                                        'cmdname' => 'node',
-                                                        'extra' => {
-                                                          'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                          
'spaces_before_argument' => ' '
+                                                      'structure' => {
+                                                        'menu_next' => {
+                                                          'cmdname' => 'node',
+                                                          'extra' => {
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
+                                                            
'spaces_before_argument' => ' '
+                                                          },
+                                                          'structure' => {
+                                                            'menu_next' => {
+                                                              'cmdname' => 
'node',
+                                                              'extra' => {
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
+                                                                
'spaces_before_argument' => ' '
+                                                              },
+                                                              'structure' => {
+                                                                'menu_next' => 
{
+                                                                  'cmdname' => 
'node',
+                                                                  'extra' => {
+                                                                    
'normalized' => 'AAA-AAA-BBB',
+                                                                    
'spaces_before_argument' => ' '
+                                                                  },
+                                                                  'structure' 
=> {
+                                                                    
'menu_next' => {
+                                                                      
'cmdname' => 'node',
+                                                                      'extra' 
=> {
+                                                                        
'normalized' => 'CCC-CCC-DDD',
+                                                                        
'spaces_before_argument' => ' '
+                                                                      },
+                                                                      
'structure' => {
+                                                                        
'menu_next' => {
+                                                                          
'cmdname' => 'node',
+                                                                          
'extra' => {
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
+                                                                            
'spaces_before_argument' => ' '
+                                                                          },
+                                                                          
'structure' => {
+                                                                            
'menu_next' => {
+                                                                              
'cmdname' => 'node',
+                                                                              
'extra' => {
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
+                                                                               
 'spaces_before_argument' => ' '
+                                                                              
},
+                                                                              
'structure' => {
+                                                                               
 'menu_next' => {
+                                                                               
   'cmdname' => 'node',
+                                                                               
   'extra' => {
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
+                                                                               
     'spaces_before_argument' => ' '
+                                                                               
   },
+                                                                               
   'structure' => {
+                                                                               
     'menu_next' => {
+                                                                               
       'cmdname' => 'node',
+                                                                               
       'extra' => {
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
+                                                                               
         'spaces_before_argument' => ' '
+                                                                               
       },
+                                                                               
       'structure' => {
+                                                                               
         'menu_next' => {
+                                                                               
           'cmdname' => 'node',
+                                                                               
           'extra' => {
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
+                                                                               
             'spaces_before_argument' => ' '
+                                                                               
           },
+                                                                               
           'structure' => {
+                                                                               
             'menu_next' => {
+                                                                               
               'cmdname' => 'node',
+                                                                               
               'extra' => {
+                                                                               
                 'normalized' => '8_002e27in',
+                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
               },
+                                                                               
               'structure' => {
+                                                                               
                 'menu_next' => {
+                                                                               
                   'cmdname' => 'node',
+                                                                               
                   'extra' => {
+                                                                               
                     'normalized' => 'sansserif-slanted',
+                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                   },
+                                                                               
                   'structure' => {
+                                                                               
                     'menu_next' => {
+                                                                               
                       'cmdname' => 'node',
+                                                                               
                       'extra' => {
+                                                                               
                         'normalized' => 'indicateurl',
+                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                       },
+                                                                               
                       'structure' => {
+                                                                               
                         'menu_next' => {
+                                                                               
                           'cmdname' => 'node',
+                                                                               
                           'extra' => {
+                                                                               
                             'normalized' => 'gH-3rd',
+                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                           },
+                                                                               
                           'structure' => {
+                                                                               
                             'menu_next' => {
+                                                                               
                               'cmdname' => 'node',
+                                                                               
                               'extra' => {
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
+                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                               },
+                                                                               
                               'structure' => {
+                                                                               
                                 'menu_prev' => {},
+                                                                               
                                 'menu_up' => {},
+                                                                               
                                 'menu_up_hash' => {
+                                                                               
                                   'Top' => 1
+                                                                               
                                 }
+                                                                               
                               }
+                                                                               
                             },
+                                                                               
                             'menu_prev' => {},
+                                                                               
                             'menu_up' => {},
+                                                                               
                             'menu_up_hash' => {
+                                                                               
                               'Top' => 1
+                                                                               
                             }
+                                                                               
                           }
+                                                                               
                         },
+                                                                               
                         'menu_prev' => {},
+                                                                               
                         'menu_up' => {},
+                                                                               
                         'menu_up_hash' => {
+                                                                               
                           'Top' => 1
+                                                                               
                         }
+                                                                               
                       }
+                                                                               
                     },
+                                                                               
                     'menu_prev' => {},
+                                                                               
                     'menu_up' => {},
+                                                                               
                     'menu_up_hash' => {
+                                                                               
                       'Top' => 1
+                                                                               
                     }
+                                                                               
                   }
+                                                                               
                 },
+                                                                               
                 'menu_prev' => {},
+                                                                               
                 'menu_up' => {},
+                                                                               
                 'menu_up_hash' => {
+                                                                               
                   'Top' => 1
+                                                                               
                 }
+                                                                               
               }
+                                                                               
             },
+                                                                               
             'menu_prev' => {},
+                                                                               
             'menu_up' => {},
+                                                                               
             'menu_up_hash' => {
+                                                                               
               'Top' => 1
+                                                                               
             }
+                                                                               
           }
+                                                                               
         },
+                                                                               
         'menu_prev' => {},
+                                                                               
         'menu_up' => {},
+                                                                               
         'menu_up_hash' => {
+                                                                               
           'Top' => 1
+                                                                               
         }
+                                                                               
       }
+                                                                               
     },
+                                                                               
     'menu_prev' => {},
+                                                                               
     'menu_up' => {},
+                                                                               
     'menu_up_hash' => {
+                                                                               
       'Top' => 1
+                                                                               
     }
+                                                                               
   }
+                                                                               
 },
+                                                                               
 'menu_prev' => {},
+                                                                               
 'menu_up' => {},
+                                                                               
 'menu_up_hash' => {
+                                                                               
   'Top' => 1
+                                                                               
 }
+                                                                              }
+                                                                            },
+                                                                            
'menu_prev' => {},
+                                                                            
'menu_up' => {},
+                                                                            
'menu_up_hash' => {
+                                                                              
'Top' => 1
+                                                                            }
+                                                                          }
+                                                                        },
+                                                                        
'menu_prev' => {},
+                                                                        
'menu_up' => {},
+                                                                        
'menu_up_hash' => {
+                                                                          
'Top' => 1
+                                                                        }
+                                                                      }
+                                                                    },
+                                                                    
'menu_prev' => {},
+                                                                    'menu_up' 
=> {},
+                                                                    
'menu_up_hash' => {
+                                                                      'Top' => 
1
+                                                                    }
+                                                                  }
+                                                                },
+                                                                'menu_prev' => 
{},
+                                                                'menu_up' => 
{},
+                                                                'menu_up_hash' 
=> {
+                                                                  'Top' => 1
+                                                                }
+                                                              }
+                                                            },
+                                                            'menu_prev' => {},
+                                                            'menu_up' => {},
+                                                            'menu_up_hash' => {
+                                                              'Top' => 1
+                                                            }
+                                                          }
                                                         },
                                                         'menu_prev' => {},
                                                         'menu_up' => {},
                                                         'menu_up_hash' => {
                                                           'Top' => 1
                                                         }
-                                                      },
-                                                      'menu_prev' => {},
-                                                      'menu_up' => {},
-                                                      'menu_up_hash' => {
-                                                        'Top' => 1
                                                       }
                                                     },
                                                     'menu_prev' => {},
@@ -22696,11 +22929,6 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                                                     'menu_up_hash' => {
                                                       'Top' => 1
                                                     }
-                                                  },
-                                                  'menu_prev' => {},
-                                                  'menu_up' => {},
-                                                  'menu_up_hash' => {
-                                                    'Top' => 1
                                                   }
                                                 },
                                                 'menu_prev' => {},
@@ -22708,11 +22936,6 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                                                 'menu_up_hash' => {
                                                   'Top' => 1
                                                 }
-                                              },
-                                              'menu_prev' => {},
-                                              'menu_up' => {},
-                                              'menu_up_hash' => {
-                                                'Top' => 1
                                               }
                                             },
                                             'menu_prev' => {},
@@ -22720,11 +22943,6 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                                             'menu_up_hash' => {
                                               'Top' => 1
                                             }
-                                          },
-                                          'menu_prev' => {},
-                                          'menu_up' => {},
-                                          'menu_up_hash' => {
-                                            'Top' => 1
                                           }
                                         },
                                         'menu_prev' => {},
@@ -22732,11 +22950,6 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                                         'menu_up_hash' => {
                                           'Top' => 1
                                         }
-                                      },
-                                      'menu_prev' => {},
-                                      'menu_up' => {},
-                                      'menu_up_hash' => {
-                                        'Top' => 1
                                       }
                                     },
                                     'menu_prev' => {},
@@ -22744,11 +22957,6 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                                     'menu_up_hash' => {
                                       'Top' => 1
                                     }
-                                  },
-                                  'menu_prev' => {},
-                                  'menu_up' => {},
-                                  'menu_up_hash' => {
-                                    'Top' => 1
                                   }
                                 },
                                 'menu_prev' => {},
@@ -22756,11 +22964,6 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                                 'menu_up_hash' => {
                                   'Top' => 1
                                 }
-                              },
-                              'menu_prev' => {},
-                              'menu_up' => {},
-                              'menu_up_hash' => {
-                                'Top' => 1
                               }
                             },
                             'menu_prev' => {},
@@ -22768,11 +22971,6 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                             'menu_up_hash' => {
                               'Top' => 1
                             }
-                          },
-                          'menu_prev' => {},
-                          'menu_up' => {},
-                          'menu_up_hash' => {
-                            'Top' => 1
                           }
                         },
                         'menu_prev' => {},
@@ -22780,11 +22978,6 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                         'menu_up_hash' => {
                           'Top' => 1
                         }
-                      },
-                      'menu_prev' => {},
-                      'menu_up' => {},
-                      'menu_up_hash' => {
-                        'Top' => 1
                       }
                     },
                     'menu_prev' => {},
@@ -22792,11 +22985,6 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                     'menu_up_hash' => {
                       'Top' => 1
                     }
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'Top' => 1
                   }
                 },
                 'menu_prev' => {},
@@ -22804,11 +22992,6 @@ $result_menus{'at_commands_in_refs_utf8'} = {
                 'menu_up_hash' => {
                   'Top' => 1
                 }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'Top' => 1
               }
             },
             'menu_prev' => {},
@@ -22816,84 +22999,69 @@ $result_menus{'at_commands_in_refs_utf8'} = {
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs_utf8'}{'menu_child'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
-$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_up'} = 
$result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'struct
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $resu [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'at_commands_in_r [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_ref [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs_utf8'}{'structure'}{'m [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'
 [...]
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
+$result_menus{'at_commands_in_refs_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_utf8'};
 
 $result_errors{'at_commands_in_refs_utf8'} = [
   {
diff --git a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
index b707cc4885..66efbd5cd8 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
@@ -149,7 +149,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -610,7 +611,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -691,7 +693,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -772,7 +775,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 26,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -853,7 +857,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 29,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -934,7 +939,8 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 32,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1742,7 +1748,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1757,7 +1764,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1777,7 +1785,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e9',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1798,7 +1807,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e0-_00e8-_00f9',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1819,7 +1829,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1840,7 +1851,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e7',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1897,23 +1909,23 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1923,28 +1935,13 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => '_00e9',
+        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
-          },
-          'normalized' => '_00e0-_00e8-_00f9',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
@@ -1955,71 +1952,98 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
               },
               'structure' => {
                 'level' => 1,
-                'number' => 4
+                'number' => 2
               }
             },
-            'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
+            'normalized' => '_00e9',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 3
+                  }
                 },
-                'structure' => {
-                  'level' => 1,
-                  'number' => 5
-                }
+                'normalized' => '_00e0-_00e8-_00f9',
+                'spaces_before_argument' => ' '
               },
-              'normalized' => '_00e7',
-              'spaces_before_argument' => ' '
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'chapter',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 1,
+                        'number' => 4
+                      }
+                    },
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'chapter',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 1,
+                            'number' => 5
+                          }
+                        },
+                        'normalized' => '_00e7',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
             },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'char_latin1_latin1_in_refs'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'char_latin1_latin1_in_refs'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'char_latin1_latin1_in_refs'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'char_latin1_latin1_in_refs'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_prev'} = 
$result_nodes{'char_latin1_latin1_in_refs'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_up'} = 
$result_nodes{'char_latin1_latin1_in_refs'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'node_next'} = 
$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin1_latin1_in_refs'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin1_latin1_in_refs'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin1_latin1_in_refs'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin1_latin1_in_refs'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'char_latin1_latin1_in_refs'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin1_latin1_in_refs'};
+$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'node_next'} = 
$result_nodes{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'};
 
 $result_menus{'char_latin1_latin1_in_refs'} = {
   'cmdname' => 'node',
@@ -2028,75 +2052,87 @@ $result_menus{'char_latin1_latin1_in_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e9',
+        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_00e0-_00e8-_00f9',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
+            'normalized' => '_00e9',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => '_00e7',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => '_00e0-_00e8-_00f9',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => '_00e7',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
             },
             'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'char_latin1_latin1_in_refs'};
-$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'char_latin1_latin1_in_refs'};
-$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'};
-$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'char_latin1_latin1_in_refs'};
-$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'char_latin1_latin1_in_refs'}{'menu_child'};
-$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'char_latin1_latin1_in_refs'};
-$result_menus{'char_latin1_latin1_in_refs'}{'menu_child'}{'menu_up'} = 
$result_menus{'char_latin1_latin1_in_refs'};
+$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin1_latin1_in_refs'};
+$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin1_latin1_in_refs'};
+$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin1_latin1_in_refs'};
+$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'};
+$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin1_latin1_in_refs'};
+$result_menus{'char_latin1_latin1_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin1_latin1_in_refs'};
 
 $result_errors{'char_latin1_latin1_in_refs'} = [];
 
diff --git a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
index c909744ae5..753dadb192 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
@@ -149,7 +149,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -610,7 +611,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -691,7 +693,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -772,7 +775,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 26,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -853,7 +857,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 29,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -934,7 +939,8 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 32,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1742,7 +1748,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1757,7 +1764,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1777,7 +1785,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e9',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1798,7 +1807,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e0-_00e8-_00f9',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1819,7 +1829,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1840,7 +1851,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'normalized' => '_00e7',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1897,23 +1909,23 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1923,28 +1935,13 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => '_00e9',
+        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
-          },
-          'normalized' => '_00e0-_00e8-_00f9',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
@@ -1955,71 +1952,98 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
               },
               'structure' => {
                 'level' => 1,
-                'number' => 4
+                'number' => 2
               }
             },
-            'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
+            'normalized' => '_00e9',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 3
+                  }
                 },
-                'structure' => {
-                  'level' => 1,
-                  'number' => 5
-                }
+                'normalized' => '_00e0-_00e8-_00f9',
+                'spaces_before_argument' => ' '
               },
-              'normalized' => '_00e7',
-              'spaces_before_argument' => ' '
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'chapter',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 1,
+                        'number' => 4
+                      }
+                    },
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'chapter',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 1,
+                            'number' => 5
+                          }
+                        },
+                        'normalized' => '_00e7',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
             },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'char_latin1_utf8_in_refs'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'char_latin1_utf8_in_refs'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'char_latin1_utf8_in_refs'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'char_latin1_utf8_in_refs'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_prev'} = 
$result_nodes{'char_latin1_utf8_in_refs'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_up'} = 
$result_nodes{'char_latin1_utf8_in_refs'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'node_next'} = 
$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin1_utf8_in_refs'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin1_utf8_in_refs'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin1_utf8_in_refs'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin1_utf8_in_refs'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'char_latin1_utf8_in_refs'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin1_utf8_in_refs'};
+$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'node_next'} = 
$result_nodes{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'};
 
 $result_menus{'char_latin1_utf8_in_refs'} = {
   'cmdname' => 'node',
@@ -2028,75 +2052,87 @@ $result_menus{'char_latin1_utf8_in_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e9',
+        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_00e0-_00e8-_00f9',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
+            'normalized' => '_00e9',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => '_00e7',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => '_00e0-_00e8-_00f9',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => '_00e7',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
             },
             'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'char_latin1_utf8_in_refs'};
-$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'char_latin1_utf8_in_refs'};
-$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'};
-$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'char_latin1_utf8_in_refs'};
-$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'char_latin1_utf8_in_refs'}{'menu_child'};
-$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'char_latin1_utf8_in_refs'};
-$result_menus{'char_latin1_utf8_in_refs'}{'menu_child'}{'menu_up'} = 
$result_menus{'char_latin1_utf8_in_refs'};
+$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin1_utf8_in_refs'};
+$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin1_utf8_in_refs'};
+$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin1_utf8_in_refs'};
+$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'};
+$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin1_utf8_in_refs'};
+$result_menus{'char_latin1_utf8_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin1_utf8_in_refs'};
 
 $result_errors{'char_latin1_utf8_in_refs'} = [];
 
diff --git a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
index 6ea641ab25..6483982f32 100644
--- a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
@@ -143,7 +143,8 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -227,7 +228,8 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                     'line_nr' => 18,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -674,7 +676,8 @@ $result_sectioning{'char_latin2_latin2_in_refs'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -689,7 +692,8 @@ $result_sectioning{'char_latin2_latin2_in_refs'} = {
                   'extra' => {
                     'normalized' => '_0104-_0105-_02db-_0118-_0119',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -729,25 +733,6 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => '_0104-_0105-_02db-_0118-_0119',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -763,11 +748,34 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => '_0104-_0105-_02db-_0118-_0119',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'char_latin2_latin2_in_refs'}{'menu_child'}{'node_prev'} = 
$result_nodes{'char_latin2_latin2_in_refs'};
-$result_nodes{'char_latin2_latin2_in_refs'}{'menu_child'}{'node_up'} = 
$result_nodes{'char_latin2_latin2_in_refs'};
-$result_nodes{'char_latin2_latin2_in_refs'}{'node_next'} = 
$result_nodes{'char_latin2_latin2_in_refs'}{'menu_child'};
+$result_nodes{'char_latin2_latin2_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'char_latin2_latin2_in_refs'};
+$result_nodes{'char_latin2_latin2_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'char_latin2_latin2_in_refs'};
+$result_nodes{'char_latin2_latin2_in_refs'}{'structure'}{'node_next'} = 
$result_nodes{'char_latin2_latin2_in_refs'}{'structure'}{'menu_child'};
 
 $result_menus{'char_latin2_latin2_in_refs'} = {
   'cmdname' => 'node',
@@ -776,19 +784,23 @@ $result_menus{'char_latin2_latin2_in_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_0104-_0105-_02db-_0118-_0119',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => '_0104-_0105-_02db-_0118-_0119',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'char_latin2_latin2_in_refs'}{'menu_child'}{'menu_up'} = 
$result_menus{'char_latin2_latin2_in_refs'};
+$result_menus{'char_latin2_latin2_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'char_latin2_latin2_in_refs'};
 
 $result_errors{'char_latin2_latin2_in_refs'} = [];
 
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index 607bfb2d71..b681417f76 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -199,7 +199,8 @@ $result_trees{'japanese_shift_jis'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -659,7 +660,8 @@ $result_trees{'japanese_shift_jis'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -763,7 +765,8 @@ $result_trees{'japanese_shift_jis'} = {
         'line_nr' => 36,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1033,7 +1036,8 @@ $result_sectioning{'japanese_shift_jis'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1048,7 +1052,8 @@ $result_sectioning{'japanese_shift_jis'} = {
                   'extra' => {
                     'normalized' => 'Preface',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1068,7 +1073,8 @@ $result_sectioning{'japanese_shift_jis'} = {
                   'extra' => {
                     'normalized' => 'Introduction',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1112,23 +1118,23 @@ $result_nodes{'japanese_shift_jis'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'Preface',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1138,40 +1144,46 @@ $result_nodes{'japanese_shift_jis'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'Introduction',
+        'normalized' => 'Preface',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'Introduction',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'japanese_shift_jis'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'japanese_shift_jis'}{'menu_child'};
-$result_nodes{'japanese_shift_jis'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'japanese_shift_jis'};
-$result_nodes{'japanese_shift_jis'}{'menu_child'}{'node_prev'} = 
$result_nodes{'japanese_shift_jis'};
-$result_nodes{'japanese_shift_jis'}{'menu_child'}{'node_up'} = 
$result_nodes{'japanese_shift_jis'};
-$result_nodes{'japanese_shift_jis'}{'node_next'} = 
$result_nodes{'japanese_shift_jis'}{'menu_child'};
+$result_nodes{'japanese_shift_jis'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'japanese_shift_jis'}{'structure'}{'menu_child'};
+$result_nodes{'japanese_shift_jis'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'japanese_shift_jis'};
+$result_nodes{'japanese_shift_jis'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'japanese_shift_jis'};
+$result_nodes{'japanese_shift_jis'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'japanese_shift_jis'};
+$result_nodes{'japanese_shift_jis'}{'structure'}{'node_next'} = 
$result_nodes{'japanese_shift_jis'}{'structure'}{'menu_child'};
 
 $result_menus{'japanese_shift_jis'} = {
   'cmdname' => 'node',
@@ -1179,33 +1191,39 @@ $result_menus{'japanese_shift_jis'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Preface',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Introduction',
+        'normalized' => 'Preface',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Introduction',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'japanese_shift_jis'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'japanese_shift_jis'}{'menu_child'};
-$result_menus{'japanese_shift_jis'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'japanese_shift_jis'};
-$result_menus{'japanese_shift_jis'}{'menu_child'}{'menu_up'} = 
$result_menus{'japanese_shift_jis'};
+$result_menus{'japanese_shift_jis'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'japanese_shift_jis'}{'structure'}{'menu_child'};
+$result_menus{'japanese_shift_jis'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'japanese_shift_jis'};
+$result_menus{'japanese_shift_jis'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'japanese_shift_jis'};
 
 $result_errors{'japanese_shift_jis'} = [
   {
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index bf72911731..b67e1dfe62 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -478,7 +478,8 @@ $result_trees{'sample_utf8'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -822,7 +823,8 @@ $result_trees{'sample_utf8'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1235,7 +1237,8 @@ $result_trees{'sample_utf8'} = {
         'line_nr' => 61,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1334,7 +1337,8 @@ $result_trees{'sample_utf8'} = {
         'line_nr' => 66,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1747,7 +1751,8 @@ $result_sectioning{'sample_utf8'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1762,7 +1767,8 @@ $result_sectioning{'sample_utf8'} = {
                   'extra' => {
                     'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1782,7 +1788,8 @@ $result_sectioning{'sample_utf8'} = {
                   'extra' => {
                     'normalized' => 
'Second-Chapter-AE-_0104_0118-ae-_0105_0119',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1804,7 +1811,8 @@ $result_sectioning{'sample_utf8'} = {
                     'isindex' => 1,
                     'normalized' => 'Index-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1851,23 +1859,23 @@ $result_nodes{'sample_utf8'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1877,61 +1885,69 @@ $result_nodes{'sample_utf8'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119',
+        'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'unnumbered',
-            'extra' => {
-              'spaces_before_argument' => ' '
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
             },
-            'structure' => {
-              'level' => 1
-            }
+            'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119',
+            'spaces_before_argument' => ' '
           },
-          'isindex' => 1,
-          'normalized' => 'Index-node',
-          'spaces_before_argument' => ' '
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'unnumbered',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1
+                  }
+                },
+                'isindex' => 1,
+                'normalized' => 'Index-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'sample_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'sample_utf8'}{'menu_child'}{'node_next'};
-$result_nodes{'sample_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'sample_utf8'};
-$result_nodes{'sample_utf8'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'sample_utf8'}{'menu_child'};
-$result_nodes{'sample_utf8'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'sample_utf8'};
-$result_nodes{'sample_utf8'}{'menu_child'}{'node_prev'} = 
$result_nodes{'sample_utf8'};
-$result_nodes{'sample_utf8'}{'menu_child'}{'node_up'} = 
$result_nodes{'sample_utf8'};
-$result_nodes{'sample_utf8'}{'node_next'} = 
$result_nodes{'sample_utf8'}{'menu_child'};
+$result_nodes{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'sample_utf8'};
+$result_nodes{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'sample_utf8'}{'structure'}{'menu_child'};
+$result_nodes{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'sample_utf8'};
+$result_nodes{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'sample_utf8'};
+$result_nodes{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'sample_utf8'};
+$result_nodes{'sample_utf8'}{'structure'}{'node_next'} = 
$result_nodes{'sample_utf8'}{'structure'}{'menu_child'};
 
 $result_menus{'sample_utf8'} = {
   'cmdname' => 'node',
@@ -1939,48 +1955,56 @@ $result_menus{'sample_utf8'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119',
+        'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'isindex' => 1,
-          'normalized' => 'Index-node',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'isindex' => 1,
+                'normalized' => 'Index-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'sample_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'sample_utf8'}{'menu_child'}{'menu_next'};
-$result_menus{'sample_utf8'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'sample_utf8'};
-$result_menus{'sample_utf8'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'sample_utf8'}{'menu_child'};
-$result_menus{'sample_utf8'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'sample_utf8'};
-$result_menus{'sample_utf8'}{'menu_child'}{'menu_up'} = 
$result_menus{'sample_utf8'};
+$result_menus{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'sample_utf8'};
+$result_menus{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'sample_utf8'}{'structure'}{'menu_child'};
+$result_menus{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'sample_utf8'};
+$result_menus{'sample_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'sample_utf8'};
 
 $result_errors{'sample_utf8'} = [];
 
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index d1cf06610b..db550c86b1 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -89,7 +89,8 @@ $result_trees{'weird_accents'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -590,7 +591,8 @@ $result_sectioning{'weird_accents'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -618,7 +620,8 @@ $result_nodes{'weird_accents'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'weird_accents'} = {
@@ -626,7 +629,8 @@ $result_menus{'weird_accents'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'weird_accents'} = [];
diff --git a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl 
b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
index 5b97e16583..a57885ba15 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -89,7 +89,8 @@ $result_trees{'weird_accents_disable_encoding'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -590,7 +591,8 @@ $result_sectioning{'weird_accents_disable_encoding'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -618,7 +620,8 @@ $result_nodes{'weird_accents_disable_encoding'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'weird_accents_disable_encoding'} = {
@@ -626,7 +629,8 @@ $result_menus{'weird_accents_disable_encoding'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'weird_accents_disable_encoding'} = [];
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index 0fa40c5b38..d67dd33dfe 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -319,7 +319,8 @@ $result_trees{'cond'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -434,7 +435,8 @@ $result_nodes{'cond'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'cond'} = {
@@ -442,7 +444,8 @@ $result_menus{'cond'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'cond'} = [];
diff --git a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index 0501299c09..66fb900f54 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -333,7 +333,8 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -451,7 +452,8 @@ $result_nodes{'cond_ifhtml_ifinfo_iftex'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'cond_ifhtml_ifinfo_iftex'} = {
@@ -459,7 +461,8 @@ $result_menus{'cond_ifhtml_ifinfo_iftex'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'cond_ifhtml_ifinfo_iftex'} = [];
diff --git a/tp/t/results/formatting/cond_info.pl 
b/tp/t/results/formatting/cond_info.pl
index 678191f398..f6cf7ef50e 100644
--- a/tp/t/results/formatting/cond_info.pl
+++ b/tp/t/results/formatting/cond_info.pl
@@ -305,7 +305,8 @@ $result_trees{'cond_info'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -417,7 +418,8 @@ $result_nodes{'cond_info'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'cond_info'} = {
@@ -425,7 +427,8 @@ $result_menus{'cond_info'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'cond_info'} = [];
diff --git a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
index 9b97a44dff..247e310c18 100644
--- a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
@@ -333,7 +333,8 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -451,7 +452,8 @@ $result_nodes{'cond_info_ifhtml_ifinfo_iftex'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'cond_info_ifhtml_ifinfo_iftex'} = {
@@ -459,7 +461,8 @@ $result_menus{'cond_info_ifhtml_ifinfo_iftex'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'cond_info_ifhtml_ifinfo_iftex'} = [];
diff --git a/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index 5967dae623..c99ddee043 100644
--- a/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -305,7 +305,8 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -417,7 +418,8 @@ $result_nodes{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
@@ -425,7 +427,8 @@ $result_menus{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = [];
diff --git a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index 0ab7da837b..769220c607 100644
--- a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -305,7 +305,8 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -417,7 +418,8 @@ $result_nodes{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
@@ -425,7 +427,8 @@ $result_menus{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'cond_no-ifhtml_no-ifinfo_no-iftex'} = [];
diff --git a/tp/t/results/formatting/cond_xml.pl 
b/tp/t/results/formatting/cond_xml.pl
index e5a6a5a247..dbab980a48 100644
--- a/tp/t/results/formatting/cond_xml.pl
+++ b/tp/t/results/formatting/cond_xml.pl
@@ -305,7 +305,8 @@ $result_trees{'cond_xml'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -417,7 +418,8 @@ $result_nodes{'cond_xml'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'cond_xml'} = {
@@ -425,7 +427,8 @@ $result_menus{'cond_xml'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'cond_xml'} = [];
diff --git a/tp/t/results/formatting/direntry_dircategory_info_split.pl 
b/tp/t/results/formatting/direntry_dircategory_info_split.pl
index e1a19d5cc9..152f9dd67d 100644
--- a/tp/t/results/formatting/direntry_dircategory_info_split.pl
+++ b/tp/t/results/formatting/direntry_dircategory_info_split.pl
@@ -514,7 +514,8 @@ $result_trees{'direntry_dircategory_info_split'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -888,7 +889,8 @@ $result_trees{'direntry_dircategory_info_split'} = {
         'line_nr' => 32,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1182,7 +1184,8 @@ $result_sectioning{'direntry_dircategory_info_split'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1197,7 +1200,8 @@ $result_sectioning{'direntry_dircategory_info_split'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1236,25 +1240,6 @@ $result_nodes{'direntry_dircategory_info_split'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1270,11 +1255,34 @@ $result_nodes{'direntry_dircategory_info_split'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'direntry_dircategory_info_split'}{'menu_child'}{'node_prev'} = 
$result_nodes{'direntry_dircategory_info_split'};
-$result_nodes{'direntry_dircategory_info_split'}{'menu_child'}{'node_up'} = 
$result_nodes{'direntry_dircategory_info_split'};
-$result_nodes{'direntry_dircategory_info_split'}{'node_next'} = 
$result_nodes{'direntry_dircategory_info_split'}{'menu_child'};
+$result_nodes{'direntry_dircategory_info_split'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'direntry_dircategory_info_split'};
+$result_nodes{'direntry_dircategory_info_split'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'direntry_dircategory_info_split'};
+$result_nodes{'direntry_dircategory_info_split'}{'structure'}{'node_next'} = 
$result_nodes{'direntry_dircategory_info_split'}{'structure'}{'menu_child'};
 
 $result_menus{'direntry_dircategory_info_split'} = {
   'cmdname' => 'node',
@@ -1282,19 +1290,23 @@ $result_menus{'direntry_dircategory_info_split'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'direntry_dircategory_info_split'}{'menu_child'}{'menu_up'} = 
$result_menus{'direntry_dircategory_info_split'};
+$result_menus{'direntry_dircategory_info_split'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'direntry_dircategory_info_split'};
 
 $result_errors{'direntry_dircategory_info_split'} = [
   {
diff --git a/tp/t/results/formatting/documentlanguage_set_option.pl 
b/tp/t/results/formatting/documentlanguage_set_option.pl
index 5bdb191523..3e35befe7f 100644
--- a/tp/t/results/formatting/documentlanguage_set_option.pl
+++ b/tp/t/results/formatting/documentlanguage_set_option.pl
@@ -188,7 +188,8 @@ $result_trees{'documentlanguage_set_option'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -334,7 +335,8 @@ $result_sectioning{'documentlanguage_set_option'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -362,7 +364,8 @@ $result_nodes{'documentlanguage_set_option'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'documentlanguage_set_option'} = {
@@ -370,7 +373,8 @@ $result_menus{'documentlanguage_set_option'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'documentlanguage_set_option'} = [];
diff --git a/tp/t/results/formatting/documentlanguage_set_option_info.pl 
b/tp/t/results/formatting/documentlanguage_set_option_info.pl
index bd6d57527e..ab653cb62d 100644
--- a/tp/t/results/formatting/documentlanguage_set_option_info.pl
+++ b/tp/t/results/formatting/documentlanguage_set_option_info.pl
@@ -188,7 +188,8 @@ $result_trees{'documentlanguage_set_option_info'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -334,7 +335,8 @@ $result_sectioning{'documentlanguage_set_option_info'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -362,7 +364,8 @@ $result_nodes{'documentlanguage_set_option_info'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'documentlanguage_set_option_info'} = {
@@ -370,7 +373,8 @@ $result_menus{'documentlanguage_set_option_info'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'documentlanguage_set_option_info'} = [];
diff --git a/tp/t/results/formatting/documentlanguage_set_unknown.pl 
b/tp/t/results/formatting/documentlanguage_set_unknown.pl
index b68e25d2b6..92e07f9355 100644
--- a/tp/t/results/formatting/documentlanguage_set_unknown.pl
+++ b/tp/t/results/formatting/documentlanguage_set_unknown.pl
@@ -188,7 +188,8 @@ $result_trees{'documentlanguage_set_unknown'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -334,7 +335,8 @@ $result_sectioning{'documentlanguage_set_unknown'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -362,7 +364,8 @@ $result_nodes{'documentlanguage_set_unknown'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'documentlanguage_set_unknown'} = {
@@ -370,7 +373,8 @@ $result_menus{'documentlanguage_set_unknown'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'documentlanguage_set_unknown'} = [];
diff --git a/tp/t/results/formatting/float_copying.pl 
b/tp/t/results/formatting/float_copying.pl
index 1b87fda5c1..2d24e893e9 100644
--- a/tp/t/results/formatting/float_copying.pl
+++ b/tp/t/results/formatting/float_copying.pl
@@ -362,7 +362,8 @@ $result_trees{'float_copying'} = {
                                                 'line_nr' => 45,
                                                 'macro' => ''
                                               },
-                                              'parent' => {}
+                                              'parent' => {},
+                                              'structure' => {}
                                             },
                                             'node_argument' => {
                                               'node_content' => [
@@ -714,7 +715,8 @@ $result_trees{'float_copying'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1814,7 +1816,8 @@ $result_sectioning{'float_copying'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1830,7 +1833,8 @@ $result_sectioning{'float_copying'} = {
                     'isindex' => 1,
                     'normalized' => 'Copying-and-floats',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1869,26 +1873,6 @@ $result_nodes{'float_copying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'appendix',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 'A'
-        }
-      },
-      'isindex' => 1,
-      'normalized' => 'Copying-and-floats',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1904,11 +1888,35 @@ $result_nodes{'float_copying'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'appendix',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 'A'
+          }
+        },
+        'isindex' => 1,
+        'normalized' => 'Copying-and-floats',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'float_copying'}{'menu_child'}{'node_prev'} = 
$result_nodes{'float_copying'};
-$result_nodes{'float_copying'}{'menu_child'}{'node_up'} = 
$result_nodes{'float_copying'};
-$result_nodes{'float_copying'}{'node_next'} = 
$result_nodes{'float_copying'}{'menu_child'};
+$result_nodes{'float_copying'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'float_copying'};
+$result_nodes{'float_copying'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'float_copying'};
+$result_nodes{'float_copying'}{'structure'}{'node_next'} = 
$result_nodes{'float_copying'}{'structure'}{'menu_child'};
 
 $result_menus{'float_copying'} = {
   'cmdname' => 'node',
@@ -1916,20 +1924,24 @@ $result_menus{'float_copying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'Copying-and-floats',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'Copying-and-floats',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'float_copying'}{'menu_child'}{'menu_up'} = 
$result_menus{'float_copying'};
+$result_menus{'float_copying'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'float_copying'};
 
 $result_errors{'float_copying'} = [];
 
diff --git a/tp/t/results/formatting/simplest_test_date_in_header.pl 
b/tp/t/results/formatting/simplest_test_date_in_header.pl
index f02223e2bb..7fcc68d03e 100644
--- a/tp/t/results/formatting/simplest_test_date_in_header.pl
+++ b/tp/t/results/formatting/simplest_test_date_in_header.pl
@@ -143,7 +143,8 @@ $result_trees{'simplest_test_date_in_header'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -206,7 +207,8 @@ $result_nodes{'simplest_test_date_in_header'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'simplest_test_date_in_header'} = {
@@ -214,7 +216,8 @@ $result_menus{'simplest_test_date_in_header'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'simplest_test_date_in_header'} = [];
diff --git a/tp/t/results/formatting/simplest_test_prefix.pl 
b/tp/t/results/formatting/simplest_test_prefix.pl
index cc81058f63..38c088c68c 100644
--- a/tp/t/results/formatting/simplest_test_prefix.pl
+++ b/tp/t/results/formatting/simplest_test_prefix.pl
@@ -143,7 +143,8 @@ $result_trees{'simplest_test_prefix'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -206,7 +207,8 @@ $result_nodes{'simplest_test_prefix'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'simplest_test_prefix'} = {
@@ -214,7 +216,8 @@ $result_menus{'simplest_test_prefix'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'simplest_test_prefix'} = [];
diff --git a/tp/t/results/formatting/simplest_test_prefix_info.pl 
b/tp/t/results/formatting/simplest_test_prefix_info.pl
index 7764f0aee4..7c32012622 100644
--- a/tp/t/results/formatting/simplest_test_prefix_info.pl
+++ b/tp/t/results/formatting/simplest_test_prefix_info.pl
@@ -143,7 +143,8 @@ $result_trees{'simplest_test_prefix_info'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -206,7 +207,8 @@ $result_nodes{'simplest_test_prefix_info'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'simplest_test_prefix_info'} = {
@@ -214,7 +216,8 @@ $result_menus{'simplest_test_prefix_info'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'simplest_test_prefix_info'} = [];
diff --git a/tp/t/results/formatting/split_for_format_not_split.pl 
b/tp/t/results/formatting/split_for_format_not_split.pl
index 5ff5ec2297..8e60204fe5 100644
--- a/tp/t/results/formatting/split_for_format_not_split.pl
+++ b/tp/t/results/formatting/split_for_format_not_split.pl
@@ -143,7 +143,8 @@ $result_trees{'split_for_format_not_split'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -206,7 +207,8 @@ $result_nodes{'split_for_format_not_split'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'split_for_format_not_split'} = {
@@ -214,7 +216,8 @@ $result_menus{'split_for_format_not_split'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'split_for_format_not_split'} = [];
diff --git a/tp/t/results/formatting/split_nocopying.pl 
b/tp/t/results/formatting/split_nocopying.pl
index 235707c4e2..dcabd43aa5 100644
--- a/tp/t/results/formatting/split_nocopying.pl
+++ b/tp/t/results/formatting/split_nocopying.pl
@@ -105,7 +105,8 @@ $result_trees{'split_nocopying'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -318,7 +319,8 @@ $result_trees{'split_nocopying'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -493,7 +495,8 @@ $result_sectioning{'split_nocopying'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -508,7 +511,8 @@ $result_sectioning{'split_nocopying'} = {
                   'extra' => {
                     'normalized' => 'Ch1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -547,25 +551,6 @@ $result_nodes{'split_nocopying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'Ch1',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -581,11 +566,34 @@ $result_nodes{'split_nocopying'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'Ch1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'split_nocopying'}{'menu_child'}{'node_prev'} = 
$result_nodes{'split_nocopying'};
-$result_nodes{'split_nocopying'}{'menu_child'}{'node_up'} = 
$result_nodes{'split_nocopying'};
-$result_nodes{'split_nocopying'}{'node_next'} = 
$result_nodes{'split_nocopying'}{'menu_child'};
+$result_nodes{'split_nocopying'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'split_nocopying'};
+$result_nodes{'split_nocopying'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'split_nocopying'};
+$result_nodes{'split_nocopying'}{'structure'}{'node_next'} = 
$result_nodes{'split_nocopying'}{'structure'}{'menu_child'};
 
 $result_menus{'split_nocopying'} = {
   'cmdname' => 'node',
@@ -593,19 +601,23 @@ $result_menus{'split_nocopying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Ch1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'Ch1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'split_nocopying'}{'menu_child'}{'menu_up'} = 
$result_menus{'split_nocopying'};
+$result_menus{'split_nocopying'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'split_nocopying'};
 
 $result_errors{'split_nocopying'} = [];
 
diff --git a/tp/t/results/formatting/split_nocopying_split.pl 
b/tp/t/results/formatting/split_nocopying_split.pl
index 9adda70727..4906150a92 100644
--- a/tp/t/results/formatting/split_nocopying_split.pl
+++ b/tp/t/results/formatting/split_nocopying_split.pl
@@ -105,7 +105,8 @@ $result_trees{'split_nocopying_split'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -318,7 +319,8 @@ $result_trees{'split_nocopying_split'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -493,7 +495,8 @@ $result_sectioning{'split_nocopying_split'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -508,7 +511,8 @@ $result_sectioning{'split_nocopying_split'} = {
                   'extra' => {
                     'normalized' => 'Ch1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -547,25 +551,6 @@ $result_nodes{'split_nocopying_split'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'Ch1',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -581,11 +566,34 @@ $result_nodes{'split_nocopying_split'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'Ch1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'split_nocopying_split'}{'menu_child'}{'node_prev'} = 
$result_nodes{'split_nocopying_split'};
-$result_nodes{'split_nocopying_split'}{'menu_child'}{'node_up'} = 
$result_nodes{'split_nocopying_split'};
-$result_nodes{'split_nocopying_split'}{'node_next'} = 
$result_nodes{'split_nocopying_split'}{'menu_child'};
+$result_nodes{'split_nocopying_split'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'split_nocopying_split'};
+$result_nodes{'split_nocopying_split'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'split_nocopying_split'};
+$result_nodes{'split_nocopying_split'}{'structure'}{'node_next'} = 
$result_nodes{'split_nocopying_split'}{'structure'}{'menu_child'};
 
 $result_menus{'split_nocopying_split'} = {
   'cmdname' => 'node',
@@ -593,19 +601,23 @@ $result_menus{'split_nocopying_split'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Ch1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'Ch1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'split_nocopying_split'}{'menu_child'}{'menu_up'} = 
$result_menus{'split_nocopying_split'};
+$result_menus{'split_nocopying_split'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'split_nocopying_split'};
 
 $result_errors{'split_nocopying_split'} = [];
 
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index 578e26c541..444e70eb53 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -3783,7 +3783,8 @@ $result_trees{'texi_bib_example'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4054,7 +4055,8 @@ $result_trees{'texi_bib_example'} = {
         'line_nr' => 40,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4182,7 +4184,8 @@ $result_trees{'texi_bib_example'} = {
                     'line_nr' => 47,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -5425,7 +5428,8 @@ $result_sectioning{'texi_bib_example'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -5440,7 +5444,8 @@ $result_sectioning{'texi_bib_example'} = {
                   'extra' => {
                     'normalized' => 'Introduction',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -5460,7 +5465,8 @@ $result_sectioning{'texi_bib_example'} = {
                   'extra' => {
                     'normalized' => 'References',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -5504,23 +5510,23 @@ $result_nodes{'texi_bib_example'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'Introduction',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -5530,40 +5536,46 @@ $result_nodes{'texi_bib_example'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'References',
+        'normalized' => 'Introduction',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'References',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'texi_bib_example'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'texi_bib_example'}{'menu_child'};
-$result_nodes{'texi_bib_example'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'texi_bib_example'};
-$result_nodes{'texi_bib_example'}{'menu_child'}{'node_prev'} = 
$result_nodes{'texi_bib_example'};
-$result_nodes{'texi_bib_example'}{'menu_child'}{'node_up'} = 
$result_nodes{'texi_bib_example'};
-$result_nodes{'texi_bib_example'}{'node_next'} = 
$result_nodes{'texi_bib_example'}{'menu_child'};
+$result_nodes{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'texi_bib_example'}{'structure'}{'menu_child'};
+$result_nodes{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'texi_bib_example'};
+$result_nodes{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'texi_bib_example'};
+$result_nodes{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'texi_bib_example'};
+$result_nodes{'texi_bib_example'}{'structure'}{'node_next'} = 
$result_nodes{'texi_bib_example'}{'structure'}{'menu_child'};
 
 $result_menus{'texi_bib_example'} = {
   'cmdname' => 'node',
@@ -5571,33 +5583,39 @@ $result_menus{'texi_bib_example'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Introduction',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'References',
+        'normalized' => 'Introduction',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'References',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'texi_bib_example'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'texi_bib_example'}{'menu_child'};
-$result_menus{'texi_bib_example'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'texi_bib_example'};
-$result_menus{'texi_bib_example'}{'menu_child'}{'menu_up'} = 
$result_menus{'texi_bib_example'};
+$result_menus{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'texi_bib_example'}{'structure'}{'menu_child'};
+$result_menus{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'texi_bib_example'};
+$result_menus{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'texi_bib_example'};
 
 $result_errors{'texi_bib_example'} = [
   {
diff --git a/tp/t/results/formatting/texi_cond.pl 
b/tp/t/results/formatting/texi_cond.pl
index 721311b880..918dd7dee3 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -319,7 +319,8 @@ $result_trees{'texi_cond'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -434,7 +435,8 @@ $result_nodes{'texi_cond'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'texi_cond'} = {
@@ -442,7 +444,8 @@ $result_menus{'texi_cond'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'texi_cond'} = [];
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index 4a763e7c67..626cf55b32 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -382,7 +382,8 @@ $result_trees{'texi_glossary'} = {
         'line_nr' => 35,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1130,7 +1131,8 @@ $result_trees{'texi_glossary'} = {
         'line_nr' => 45,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {}
   ],
@@ -1417,7 +1419,8 @@ $result_sectioning{'texi_glossary'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1432,7 +1435,8 @@ $result_sectioning{'texi_glossary'} = {
                   'extra' => {
                     'normalized' => 'glossary',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1471,25 +1475,6 @@ $result_nodes{'texi_glossary'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'glossary',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1505,11 +1490,34 @@ $result_nodes{'texi_glossary'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'glossary',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'texi_glossary'}{'menu_child'}{'node_prev'} = 
$result_nodes{'texi_glossary'};
-$result_nodes{'texi_glossary'}{'menu_child'}{'node_up'} = 
$result_nodes{'texi_glossary'};
-$result_nodes{'texi_glossary'}{'node_next'} = 
$result_nodes{'texi_glossary'}{'menu_child'};
+$result_nodes{'texi_glossary'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'texi_glossary'};
+$result_nodes{'texi_glossary'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'texi_glossary'};
+$result_nodes{'texi_glossary'}{'structure'}{'node_next'} = 
$result_nodes{'texi_glossary'}{'structure'}{'menu_child'};
 
 $result_menus{'texi_glossary'} = {
   'cmdname' => 'node',
@@ -1517,19 +1525,23 @@ $result_menus{'texi_glossary'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'glossary',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'glossary',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'texi_glossary'}{'menu_child'}{'menu_up'} = 
$result_menus{'texi_glossary'};
+$result_menus{'texi_glossary'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'texi_glossary'};
 
 $result_errors{'texi_glossary'} = [
   {
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 1434f8277a..11c07cf4c7 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -306,7 +306,8 @@ $result_trees{'heading_in_copying'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -377,7 +378,8 @@ $result_nodes{'heading_in_copying'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'heading_in_copying'} = {
@@ -385,7 +387,8 @@ $result_menus{'heading_in_copying'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'heading_in_copying'} = [];
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index 4233bcd43f..0e4f6167db 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -127,7 +127,8 @@ $result_trees{'check_htmlxref'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -569,7 +570,8 @@ $result_trees{'check_htmlxref'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -703,7 +705,8 @@ $result_sectioning{'check_htmlxref'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -732,22 +735,6 @@ $result_nodes{'check_htmlxref'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'no_existing_no_manual.info'
-          }
-        ]
-      }
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -763,27 +750,47 @@ $result_nodes{'check_htmlxref'} = {
       }
     }
   ],
-  'node_next' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => '../there/no_existing_no_manual_direction'
-        }
-      ]
-    }
-  },
-  'node_prev' => {},
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'no_existing_no_manual.info'
+              }
+            ]
+          }
         }
-      ]
+      }
+    },
+    'node_next' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => '../there/no_existing_no_manual_direction'
+          }
+        ]
+      }
+    },
+    'node_prev' => {},
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
     }
   }
 };
-$result_nodes{'check_htmlxref'}{'node_prev'} = 
$result_nodes{'check_htmlxref'}{'menu_child'};
+$result_nodes{'check_htmlxref'}{'structure'}{'node_prev'} = 
$result_nodes{'check_htmlxref'}{'structure'}{'menu_child'};
 
 $result_menus{'check_htmlxref'} = {
   'cmdname' => 'node',
@@ -791,28 +798,32 @@ $result_menus{'check_htmlxref'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
       'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'other_no_existing_no_manual'
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_next' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'other_no_existing_no_manual'
+              }
+            ]
           }
-        ]
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'check_htmlxref'}{'menu_child'}{'menu_up'} = 
$result_menus{'check_htmlxref'};
+$result_menus{'check_htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'check_htmlxref'};
 
 $result_errors{'check_htmlxref'} = [];
 
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index 851b1a969c..f67f0380c6 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -365,7 +365,8 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -714,7 +715,8 @@ $result_sectioning{'deftypefnnewline_for_copying_after'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -742,7 +744,8 @@ $result_nodes{'deftypefnnewline_for_copying_after'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'deftypefnnewline_for_copying_after'} = {
@@ -750,7 +753,8 @@ $result_menus{'deftypefnnewline_for_copying_after'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'deftypefnnewline_for_copying_after'} = [];
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index b4cfdd15c8..dd1a273656 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -325,7 +325,8 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -665,7 +666,8 @@ $result_sectioning{'deftypefnnewline_for_copying_before'} = 
{
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -693,7 +695,8 @@ $result_nodes{'deftypefnnewline_for_copying_before'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'deftypefnnewline_for_copying_before'} = {
@@ -701,7 +704,8 @@ $result_menus{'deftypefnnewline_for_copying_before'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'deftypefnnewline_for_copying_before'} = [];
diff --git a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index 0919f45347..f89a261f56 100644
--- a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -100,7 +100,8 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -206,7 +207,8 @@ 
$result_sectioning{'empty_lines_at_beginning_no_setfilename'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -234,7 +236,8 @@ $result_nodes{'empty_lines_at_beginning_no_setfilename'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'empty_lines_at_beginning_no_setfilename'} = {
@@ -242,7 +245,8 @@ $result_menus{'empty_lines_at_beginning_no_setfilename'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'empty_lines_at_beginning_no_setfilename'} = [];
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index 7e085fac89..4cda3a8bd1 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -88,7 +88,8 @@ $result_trees{'footnotestyle_separate_late'} = [
           'line_nr' => 3,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -179,7 +180,8 @@ $result_trees{'footnotestyle_separate_late'} = [
           'line_nr' => 6,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -318,7 +320,8 @@ $result_trees{'footnotestyle_separate_late'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -556,7 +559,8 @@ $result_sectioning{'footnotestyle_separate_late'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -571,7 +575,8 @@ $result_sectioning{'footnotestyle_separate_late'} = {
                   'extra' => {
                     'normalized' => 'chap-f',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -591,7 +596,8 @@ $result_sectioning{'footnotestyle_separate_late'} = {
                   'extra' => {
                     'normalized' => 'chap-s',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -635,22 +641,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chap-f',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
@@ -661,30 +652,52 @@ $result_nodes{'footnotestyle_separate_late'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'chap-s',
+        'normalized' => 'chap-f',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'chap-s',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'footnotestyle_separate_late'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'footnotestyle_separate_late'}{'node_next'};
-$result_nodes{'footnotestyle_separate_late'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'footnotestyle_separate_late'};
-$result_nodes{'footnotestyle_separate_late'}{'node_next'}{'node_prev'} = 
$result_nodes{'footnotestyle_separate_late'};
-$result_nodes{'footnotestyle_separate_late'}{'node_next'}{'node_up'} = 
$result_nodes{'footnotestyle_separate_late'};
+$result_nodes{'footnotestyle_separate_late'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'footnotestyle_separate_late'}{'structure'}{'node_next'};
+$result_nodes{'footnotestyle_separate_late'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'footnotestyle_separate_late'};
+$result_nodes{'footnotestyle_separate_late'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'footnotestyle_separate_late'};
+$result_nodes{'footnotestyle_separate_late'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'footnotestyle_separate_late'};
 
 $result_menus{'footnotestyle_separate_late'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'footnotestyle_separate_late'} = [];
@@ -701,7 +714,8 @@ $result_elements{'footnotestyle_separate_late'} = [
         'extra' => {
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
-        }
+        },
+        'structure' => {}
       },
       'section' => {
         'cmdname' => 'top',
@@ -723,7 +737,8 @@ $result_elements{'footnotestyle_separate_late'} = [
               'extra' => {
                 'normalized' => 'chap-f',
                 'spaces_before_argument' => ' '
-              }
+              },
+              'structure' => {}
             },
             'section' => {
               'cmdname' => 'chapter',
@@ -748,7 +763,8 @@ $result_elements{'footnotestyle_separate_late'} = [
                     'extra' => {
                       'normalized' => 'chap-s',
                       'spaces_before_argument' => ' '
-                    }
+                    },
+                    'structure' => {}
                   },
                   'section' => {
                     'cmdname' => 'chapter',
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index a4148151c9..f90d81357f 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -198,7 +198,8 @@ $result_trees{'html_in_copying'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -308,7 +309,8 @@ $result_sectioning{'html_in_copying'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -336,7 +338,8 @@ $result_nodes{'html_in_copying'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'html_in_copying'} = {
@@ -344,7 +347,8 @@ $result_menus{'html_in_copying'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'html_in_copying'} = [];
diff --git a/tp/t/results/html_tests/index_and_node_same_name.pl 
b/tp/t/results/html_tests/index_and_node_same_name.pl
index f67664a9a7..e6835b008f 100644
--- a/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -169,7 +169,8 @@ $result_trees{'index_and_node_same_name'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -236,7 +237,8 @@ $result_nodes{'index_and_node_same_name'} = {
     'isindex' => 1,
     'normalized' => 'index-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'index_and_node_same_name'} = {
@@ -245,7 +247,8 @@ $result_menus{'index_and_node_same_name'} = {
     'isindex' => 1,
     'normalized' => 'index-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'index_and_node_same_name'} = [];
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 12621295f1..58b77535b5 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -88,7 +88,8 @@ $result_trees{'redirection_same_labels'} = [
           'line_nr' => 3,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -418,7 +419,8 @@ $result_trees{'redirection_same_labels'} = [
           'line_nr' => 14,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -751,7 +753,8 @@ $result_trees{'redirection_same_labels'} = [
           'line_nr' => 22,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -835,7 +838,8 @@ $result_trees{'redirection_same_labels'} = [
           'line_nr' => 24,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -889,7 +893,8 @@ $result_trees{'redirection_same_labels'} = [
           'line_nr' => 26,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1122,7 +1127,8 @@ $result_trees{'redirection_same_labels'} = [
           'line_nr' => 33,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -1365,7 +1371,8 @@ $result_sectioning{'redirection_same_labels'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1380,7 +1387,8 @@ $result_sectioning{'redirection_same_labels'} = {
                   'extra' => {
                     'normalized' => 'umlaut',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1400,7 +1408,8 @@ $result_sectioning{'redirection_same_labels'} = {
                   'extra' => {
                     'normalized' => 'circumflex',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1444,55 +1453,23 @@ $result_nodes{'redirection_same_labels'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'umlaut',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
+  'menus' => [
+    {
+      'cmdname' => 'menu',
       'extra' => {
-        'normalized' => '_00ef',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_0129',
-          'spaces_before_argument' => ' '
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
           }
         }
       }
-    ],
-    'node_next' => {
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1502,20 +1479,12 @@ $result_nodes{'redirection_same_labels'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'circumflex',
+        'normalized' => 'umlaut',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_00ee',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1531,38 +1500,90 @@ $result_nodes{'redirection_same_labels'} = {
           }
         }
       ],
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'normalized' => '_00ef',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => '_0129',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'circumflex',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => '_00ee',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'redirection_same_labels'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'redirection_same_labels'}{'menu_child'}{'menu_child'};
-$result_nodes{'redirection_same_labels'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'redirection_same_labels'}{'menu_child'};
-$result_nodes{'redirection_same_labels'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'redirection_same_labels'}{'menu_child'};
-$result_nodes{'redirection_same_labels'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = $result_nodes{'redirection_same_labels'}{'menu_child'}{'node_next'};
-$result_nodes{'redirection_same_labels'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'redirection_same_labels'}{'menu_child'};
-$result_nodes{'redirection_same_labels'}{'menu_child'}{'node_next'}{'node_up'} 
= $result_nodes{'redirection_same_labels'};
-$result_nodes{'redirection_same_labels'}{'menu_child'}{'node_prev'} = 
$result_nodes{'redirection_same_labels'};
-$result_nodes{'redirection_same_labels'}{'menu_child'}{'node_up'} = 
$result_nodes{'redirection_same_labels'};
-$result_nodes{'redirection_same_labels'}{'node_next'} = 
$result_nodes{'redirection_same_labels'}{'menu_child'};
+$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'};
+$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'};
+$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'};
+$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'redirection_same_labels'};
+$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'redirection_same_labels'};
+$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'redirection_same_labels'};
+$result_nodes{'redirection_same_labels'}{'structure'}{'node_next'} = 
$result_nodes{'redirection_same_labels'}{'structure'}{'menu_child'};
 
 $result_menus{'redirection_same_labels'} = {
   'cmdname' => 'node',
@@ -1570,71 +1591,83 @@ $result_menus{'redirection_same_labels'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'umlaut',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00ef',
+        'normalized' => 'umlaut',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_0129',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => '_00ef',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => '_0129',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'umlaut' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'umlaut' => 1
+            }
+          }
         },
-        'menu_prev' => {},
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'umlaut' => 1
-        }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'umlaut' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'circumflex',
-        'spaces_before_argument' => ' '
-      },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_00ee',
-          'spaces_before_argument' => ' '
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'circumflex',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => '_00ee',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'circumflex' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'circumflex' => 1
+          'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'redirection_same_labels'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'redirection_same_labels'}{'menu_child'}{'menu_child'};
-$result_menus{'redirection_same_labels'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'redirection_same_labels'}{'menu_child'};
-$result_menus{'redirection_same_labels'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'redirection_same_labels'}{'menu_child'};
-$result_menus{'redirection_same_labels'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_menus{'redirection_same_labels'}{'menu_child'}{'menu_next'};
-$result_menus{'redirection_same_labels'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'redirection_same_labels'}{'menu_child'};
-$result_menus{'redirection_same_labels'}{'menu_child'}{'menu_next'}{'menu_up'} 
= $result_menus{'redirection_same_labels'};
-$result_menus{'redirection_same_labels'}{'menu_child'}{'menu_up'} = 
$result_menus{'redirection_same_labels'};
+$result_menus{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'redirection_same_labels'}{'structure'}{'menu_child'};
+$result_menus{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'redirection_same_labels'}{'structure'}{'menu_child'};
+$result_menus{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'redirection_same_labels'}{'structure'}{'menu_child'};
+$result_menus{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'redirection_same_labels'};
+$result_menus{'redirection_same_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'redirection_same_labels'};
 
 $result_errors{'redirection_same_labels'} = [];
 
@@ -1651,61 +1684,73 @@ $result_elements{'redirection_same_labels'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'umlaut',
-            'spaces_before_argument' => ' '
-          },
+        'structure' => {
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => '_00ef',
+              'normalized' => 'umlaut',
               'spaces_before_argument' => ' '
             },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => '_0129',
-                'spaces_before_argument' => ' '
+            'structure' => {
+              'menu_child' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => '_00ef',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_next' => {
+                    'cmdname' => 'node',
+                    'extra' => {
+                      'normalized' => '_0129',
+                      'spaces_before_argument' => ' '
+                    },
+                    'structure' => {
+                      'menu_prev' => {},
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'umlaut' => 1
+                      }
+                    }
+                  },
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'umlaut' => 1
+                  }
+                }
               },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'umlaut' => 1
-              }
-            },
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'umlaut' => 1
-            }
-          },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'circumflex',
-              'spaces_before_argument' => ' '
-            },
-            'menu_child' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => '_00ee',
-                'spaces_before_argument' => ' '
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'circumflex',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_child' => {
+                    'cmdname' => 'node',
+                    'extra' => {
+                      'normalized' => '_00ee',
+                      'spaces_before_argument' => ' '
+                    },
+                    'structure' => {
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'circumflex' => 1
+                      }
+                    }
+                  },
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
               },
               'menu_up' => {},
               'menu_up_hash' => {
-                'circumflex' => 1
+                'Top' => 1
               }
-            },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -1795,19 +1840,19 @@ $result_elements{'redirection_same_labels'} = [
   {},
   {}
 ];
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'redirection_same_labels'}[0]{'extra'}{'node'};
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'redirection_same_labels'}[0]{'extra'}{'node'};
+$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'redirection_same_labels'}[0]{'extra'}{'node'};
+$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'redirection_same_labels'}[0]{'extra'}{'node'};
 $result_elements{'redirection_same_labels'}[0]{'extra'}{'unit_command'} = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'section'};
-$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'redirection_same_labels'}[0];
 
$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'redirection_same_labels'}[0];
-$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
+$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'redirection_same_labels'}[0]{'structure'}{'directions'}{'FastForward'};
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index 4ab8653093..997e48b850 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -231,7 +231,8 @@ $result_trees{'ref_in_preformatted'} = {
                         'line_nr' => 12,
                         'macro' => ''
                       },
-                      'parent' => {}
+                      'parent' => {},
+                      'structure' => {}
                     },
                     'node_argument' => {
                       'node_content' => [
@@ -325,7 +326,8 @@ $result_trees{'ref_in_preformatted'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {}
   ],
@@ -409,15 +411,6 @@ $result_nodes{'ref_in_preformatted'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'nnn-the-node-name',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -433,11 +426,24 @@ $result_nodes{'ref_in_preformatted'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'nnn-the-node-name',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'ref_in_preformatted'}{'menu_child'}{'node_prev'} = 
$result_nodes{'ref_in_preformatted'};
-$result_nodes{'ref_in_preformatted'}{'menu_child'}{'node_up'} = 
$result_nodes{'ref_in_preformatted'};
-$result_nodes{'ref_in_preformatted'}{'node_next'} = 
$result_nodes{'ref_in_preformatted'}{'menu_child'};
+$result_nodes{'ref_in_preformatted'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'ref_in_preformatted'};
+$result_nodes{'ref_in_preformatted'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'ref_in_preformatted'};
+$result_nodes{'ref_in_preformatted'}{'structure'}{'node_next'} = 
$result_nodes{'ref_in_preformatted'}{'structure'}{'menu_child'};
 
 $result_menus{'ref_in_preformatted'} = {
   'cmdname' => 'node',
@@ -445,19 +451,23 @@ $result_menus{'ref_in_preformatted'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'nnn-the-node-name',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'nnn-the-node-name',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'ref_in_preformatted'}{'menu_child'}{'menu_up'} = 
$result_menus{'ref_in_preformatted'};
+$result_menus{'ref_in_preformatted'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'ref_in_preformatted'};
 
 $result_errors{'ref_in_preformatted'} = [];
 
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index a71f6ec1df..bcc8c7a41e 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -58,7 +58,8 @@ $result_trees{'simple_menu'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2097,7 +2098,8 @@ $result_sectioning{'simple_menu'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -2123,15 +2125,6 @@ $result_nodes{'simple_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'ggg'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -2147,9 +2140,20 @@ $result_nodes{'simple_menu'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'ggg'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'simple_menu'}{'node_next'} = 
$result_nodes{'simple_menu'}{'menu_child'};
+$result_nodes{'simple_menu'}{'structure'}{'node_next'} = 
$result_nodes{'simple_menu'}{'structure'}{'menu_child'};
 
 $result_menus{'simple_menu'} = {
   'cmdname' => 'node',
@@ -2157,13 +2161,15 @@ $result_menus{'simple_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'ggg'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'ggg'
+          }
+        ]
+      }
     }
   }
 };
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 51e9486b32..571d8319c7 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -51,7 +51,8 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -247,7 +248,8 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -564,7 +566,8 @@ $result_sectioning{'test_xrefautomaticsectiontitle'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -579,7 +582,8 @@ $result_sectioning{'test_xrefautomaticsectiontitle'} = {
                   'extra' => {
                     'normalized' => 'chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -618,25 +622,6 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chap',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -652,11 +637,34 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chap',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'test_xrefautomaticsectiontitle'}{'menu_child'}{'node_prev'} = 
$result_nodes{'test_xrefautomaticsectiontitle'};
-$result_nodes{'test_xrefautomaticsectiontitle'}{'menu_child'}{'node_up'} = 
$result_nodes{'test_xrefautomaticsectiontitle'};
-$result_nodes{'test_xrefautomaticsectiontitle'}{'node_next'} = 
$result_nodes{'test_xrefautomaticsectiontitle'}{'menu_child'};
+$result_nodes{'test_xrefautomaticsectiontitle'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'test_xrefautomaticsectiontitle'};
+$result_nodes{'test_xrefautomaticsectiontitle'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'test_xrefautomaticsectiontitle'};
+$result_nodes{'test_xrefautomaticsectiontitle'}{'structure'}{'node_next'} = 
$result_nodes{'test_xrefautomaticsectiontitle'}{'structure'}{'menu_child'};
 
 $result_menus{'test_xrefautomaticsectiontitle'} = {
   'cmdname' => 'node',
@@ -664,19 +672,23 @@ $result_menus{'test_xrefautomaticsectiontitle'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chap',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chap',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'test_xrefautomaticsectiontitle'}{'menu_child'}{'menu_up'} = 
$result_menus{'test_xrefautomaticsectiontitle'};
+$result_menus{'test_xrefautomaticsectiontitle'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'test_xrefautomaticsectiontitle'};
 
 $result_errors{'test_xrefautomaticsectiontitle'} = [];
 
diff --git 
a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
index e3a20f43f8..6fea010d8d 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -95,7 +95,8 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -291,7 +292,8 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
         'line_nr' => 11,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -574,7 +576,8 @@ 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -589,7 +592,8 @@ 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'} = {
                   'extra' => {
                     'normalized' => 'chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -628,25 +632,6 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chap',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -662,11 +647,34 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} 
= {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chap',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'test_xrefautomaticsectiontitle_off_first'}{'menu_child'}{'node_prev'}
 = $result_nodes{'test_xrefautomaticsectiontitle_off_first'};
-$result_nodes{'test_xrefautomaticsectiontitle_off_first'}{'menu_child'}{'node_up'}
 = $result_nodes{'test_xrefautomaticsectiontitle_off_first'};
-$result_nodes{'test_xrefautomaticsectiontitle_off_first'}{'node_next'} = 
$result_nodes{'test_xrefautomaticsectiontitle_off_first'}{'menu_child'};
+$result_nodes{'test_xrefautomaticsectiontitle_off_first'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'test_xrefautomaticsectiontitle_off_first'};
+$result_nodes{'test_xrefautomaticsectiontitle_off_first'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'test_xrefautomaticsectiontitle_off_first'};
+$result_nodes{'test_xrefautomaticsectiontitle_off_first'}{'structure'}{'node_next'}
 = 
$result_nodes{'test_xrefautomaticsectiontitle_off_first'}{'structure'}{'menu_child'};
 
 $result_menus{'test_xrefautomaticsectiontitle_off_first'} = {
   'cmdname' => 'node',
@@ -674,19 +682,23 @@ $result_menus{'test_xrefautomaticsectiontitle_off_first'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chap',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chap',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'test_xrefautomaticsectiontitle_off_first'}{'menu_child'}{'menu_up'}
 = $result_menus{'test_xrefautomaticsectiontitle_off_first'};
+$result_menus{'test_xrefautomaticsectiontitle_off_first'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'test_xrefautomaticsectiontitle_off_first'};
 
 $result_errors{'test_xrefautomaticsectiontitle_off_first'} = [];
 
diff --git 
a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
index 9e962876c3..3abc623e0e 100644
--- a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
@@ -75,7 +75,8 @@ $result_trees{'text_before_top_and_contents_after_title'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -265,7 +266,8 @@ 
$result_sectioning{'text_before_top_and_contents_after_title'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -311,7 +313,8 @@ $result_nodes{'text_before_top_and_contents_after_title'} = 
{
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'text_before_top_and_contents_after_title'} = {
@@ -319,7 +322,8 @@ $result_menus{'text_before_top_and_contents_after_title'} = 
{
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'text_before_top_and_contents_after_title'} = [];
diff --git 
a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
index 1aa824613e..37d40d7af8 100644
--- a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
@@ -75,7 +75,8 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -265,7 +266,8 @@ 
$result_sectioning{'text_before_top_and_summarycontents_after_title'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -311,7 +313,8 @@ 
$result_nodes{'text_before_top_and_summarycontents_after_title'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'text_before_top_and_summarycontents_after_title'} = {
@@ -319,7 +322,8 @@ 
$result_menus{'text_before_top_and_summarycontents_after_title'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'text_before_top_and_summarycontents_after_title'} = [];
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index aad5e288f3..a3479ceaac 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -167,7 +167,8 @@ $result_trees{'titles'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -368,7 +369,8 @@ $result_sectioning{'titles'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -396,7 +398,8 @@ $result_nodes{'titles'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'titles'} = {
@@ -404,7 +407,8 @@ $result_menus{'titles'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'titles'} = [];
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 5108ec2686..0f3308c649 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -105,7 +105,8 @@ $result_trees{'htmlxref'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1415,7 +1416,8 @@ $result_trees{'htmlxref'} = {
                     'line_nr' => 85,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -1717,7 +1719,8 @@ $result_trees{'htmlxref'} = {
                     'line_nr' => 90,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2160,7 +2163,8 @@ $result_trees{'htmlxref'} = {
                     'line_nr' => 95,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2363,7 +2367,8 @@ $result_trees{'htmlxref'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3473,7 +3478,8 @@ $result_sectioning{'htmlxref'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3488,7 +3494,8 @@ $result_sectioning{'htmlxref'} = {
                   'extra' => {
                     'normalized' => 'other-nodes',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3527,68 +3534,6 @@ $result_nodes{'htmlxref'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -3604,18 +3549,90 @@ $result_nodes{'htmlxref'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'other-nodes',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
+            }
+          }
+        }
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'htmlxref'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'htmlxref'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'htmlxref'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref'}{'menu_child'};
-$result_nodes{'htmlxref'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'htmlxref'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'} 
= $result_nodes{'htmlxref'}{'menu_child'};
-$result_nodes{'htmlxref'}{'menu_child'}{'menu_child'}{'node_prev'} = 
$result_nodes{'htmlxref'}{'menu_child'};
-$result_nodes{'htmlxref'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'htmlxref'}{'menu_child'};
-$result_nodes{'htmlxref'}{'menu_child'}{'node_next'} = 
$result_nodes{'htmlxref'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref'}{'menu_child'}{'node_prev'} = 
$result_nodes{'htmlxref'};
-$result_nodes{'htmlxref'}{'menu_child'}{'node_up'} = $result_nodes{'htmlxref'};
-$result_nodes{'htmlxref'}{'node_next'} = 
$result_nodes{'htmlxref'}{'menu_child'};
+$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'node_next'} 
= 
$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'node_prev'} 
= $result_nodes{'htmlxref'};
+$result_nodes{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'node_up'} = 
$result_nodes{'htmlxref'};
+$result_nodes{'htmlxref'}{'structure'}{'node_next'} = 
$result_nodes{'htmlxref'}{'structure'}{'menu_child'};
 
 $result_menus{'htmlxref'} = {
   'cmdname' => 'node',
@@ -3623,59 +3640,69 @@ $result_menus{'htmlxref'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+        'normalized' => 'other-nodes',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'other-nodes' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'other-nodes' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'other-nodes' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'other-nodes' => 1
+            }
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'other-nodes' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'other-nodes' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'htmlxref'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'htmlxref'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'htmlxref'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref'}{'menu_child'};
-$result_menus{'htmlxref'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'htmlxref'}{'menu_child'}{'menu_child'};
-$result_menus{'htmlxref'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'} 
= $result_menus{'htmlxref'}{'menu_child'};
-$result_menus{'htmlxref'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'htmlxref'}{'menu_child'};
-$result_menus{'htmlxref'}{'menu_child'}{'menu_up'} = $result_menus{'htmlxref'};
+$result_menus{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} = 
$result_menus{'htmlxref'};
 
 $result_errors{'htmlxref'} = [];
 
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index c9dcec20b0..12ca18244e 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -105,7 +105,8 @@ $result_trees{'htmlxref_nodes'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1415,7 +1416,8 @@ $result_trees{'htmlxref_nodes'} = {
                     'line_nr' => 85,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -1717,7 +1719,8 @@ $result_trees{'htmlxref_nodes'} = {
                     'line_nr' => 90,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2160,7 +2163,8 @@ $result_trees{'htmlxref_nodes'} = {
                     'line_nr' => 95,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2363,7 +2367,8 @@ $result_trees{'htmlxref_nodes'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3473,7 +3478,8 @@ $result_sectioning{'htmlxref_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3488,7 +3494,8 @@ $result_sectioning{'htmlxref_nodes'} = {
                   'extra' => {
                     'normalized' => 'other-nodes',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3527,68 +3534,6 @@ $result_nodes{'htmlxref_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -3604,18 +3549,90 @@ $result_nodes{'htmlxref_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'other-nodes',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
+            }
+          }
+        }
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'node_prev'} = 
$result_nodes{'htmlxref_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'htmlxref_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_nodes'}{'menu_child'}{'node_next'} = 
$result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'htmlxref_nodes'};
-$result_nodes{'htmlxref_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'htmlxref_nodes'};
-$result_nodes{'htmlxref_nodes'}{'node_next'} = 
$result_nodes{'htmlxref_nodes'}{'menu_child'};
+$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = 
$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref_nodes'};
+$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_nodes'};
+$result_nodes{'htmlxref_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'htmlxref_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'htmlxref_nodes'} = {
   'cmdname' => 'node',
@@ -3623,59 +3640,69 @@ $result_menus{'htmlxref_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+        'normalized' => 'other-nodes',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'other-nodes' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'other-nodes' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'other-nodes' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'other-nodes' => 1
+            }
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'other-nodes' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'other-nodes' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref_nodes'}{'menu_child'};
-$result_menus{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'htmlxref_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref_nodes'}{'menu_child'};
-$result_menus{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'htmlxref_nodes'}{'menu_child'};
-$result_menus{'htmlxref_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'htmlxref_nodes'};
+$result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_nodes'};
 
 $result_errors{'htmlxref_nodes'} = [];
 
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index bc289026d3..b89c726c33 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -105,7 +105,8 @@ $result_trees{'htmlxref_only_mono'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1415,7 +1416,8 @@ $result_trees{'htmlxref_only_mono'} = {
                     'line_nr' => 85,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -1717,7 +1719,8 @@ $result_trees{'htmlxref_only_mono'} = {
                     'line_nr' => 90,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2160,7 +2163,8 @@ $result_trees{'htmlxref_only_mono'} = {
                     'line_nr' => 95,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2363,7 +2367,8 @@ $result_trees{'htmlxref_only_mono'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3473,7 +3478,8 @@ $result_sectioning{'htmlxref_only_mono'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3488,7 +3494,8 @@ $result_sectioning{'htmlxref_only_mono'} = {
                   'extra' => {
                     'normalized' => 'other-nodes',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3527,68 +3534,6 @@ $result_nodes{'htmlxref_only_mono'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -3604,18 +3549,90 @@ $result_nodes{'htmlxref_only_mono'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'other-nodes',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
+            }
+          }
+        }
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'node_prev'} = 
$result_nodes{'htmlxref_only_mono'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'htmlxref_only_mono'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'node_next'} = 
$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'node_prev'} = 
$result_nodes{'htmlxref_only_mono'};
-$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'node_up'} = 
$result_nodes{'htmlxref_only_mono'};
-$result_nodes{'htmlxref_only_mono'}{'node_next'} = 
$result_nodes{'htmlxref_only_mono'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = 
$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref_only_mono'};
+$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono'};
+$result_nodes{'htmlxref_only_mono'}{'structure'}{'node_next'} = 
$result_nodes{'htmlxref_only_mono'}{'structure'}{'menu_child'};
 
 $result_menus{'htmlxref_only_mono'} = {
   'cmdname' => 'node',
@@ -3623,59 +3640,69 @@ $result_menus{'htmlxref_only_mono'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+        'normalized' => 'other-nodes',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'other-nodes' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'other-nodes' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'other-nodes' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'other-nodes' => 1
+            }
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'other-nodes' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'other-nodes' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono'}{'menu_child'};
-$result_menus{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'htmlxref_only_mono'}{'menu_child'}{'menu_child'};
-$result_menus{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono'}{'menu_child'};
-$result_menus{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'htmlxref_only_mono'}{'menu_child'};
-$result_menus{'htmlxref_only_mono'}{'menu_child'}{'menu_up'} = 
$result_menus{'htmlxref_only_mono'};
+$result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_mono'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono'};
 
 $result_errors{'htmlxref_only_mono'} = [];
 
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index c66e2ce11c..af08b31eb8 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -105,7 +105,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1415,7 +1416,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                     'line_nr' => 85,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -1717,7 +1719,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                     'line_nr' => 90,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2160,7 +2163,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                     'line_nr' => 95,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2363,7 +2367,8 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3473,7 +3478,8 @@ $result_sectioning{'htmlxref_only_mono_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3488,7 +3494,8 @@ $result_sectioning{'htmlxref_only_mono_nodes'} = {
                   'extra' => {
                     'normalized' => 'other-nodes',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3527,68 +3534,6 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -3604,18 +3549,90 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'other-nodes',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
+            }
+          }
+        }
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'node_prev'}
 = $result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'node_next'} = 
$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'htmlxref_only_mono_nodes'};
-$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'htmlxref_only_mono_nodes'};
-$result_nodes{'htmlxref_only_mono_nodes'}{'node_next'} = 
$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = 
$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref_only_mono_nodes'};
+$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_mono_nodes'};
+$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'htmlxref_only_mono_nodes'} = {
   'cmdname' => 'node',
@@ -3623,59 +3640,69 @@ $result_menus{'htmlxref_only_mono_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+        'normalized' => 'other-nodes',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'other-nodes' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'other-nodes' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'other-nodes' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'other-nodes' => 1
+            }
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'other-nodes' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'other-nodes' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono_nodes'}{'menu_child'};
-$result_menus{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono_nodes'}{'menu_child'};
-$result_menus{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono_nodes'}{'menu_child'};
-$result_menus{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'htmlxref_only_mono_nodes'};
+$result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_mono_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_mono_nodes'};
 
 $result_errors{'htmlxref_only_mono_nodes'} = [];
 
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 63de71ec8b..42c2fc2809 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -105,7 +105,8 @@ $result_trees{'htmlxref_only_split'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1415,7 +1416,8 @@ $result_trees{'htmlxref_only_split'} = {
                     'line_nr' => 85,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -1717,7 +1719,8 @@ $result_trees{'htmlxref_only_split'} = {
                     'line_nr' => 90,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2160,7 +2163,8 @@ $result_trees{'htmlxref_only_split'} = {
                     'line_nr' => 95,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2363,7 +2367,8 @@ $result_trees{'htmlxref_only_split'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3473,7 +3478,8 @@ $result_sectioning{'htmlxref_only_split'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3488,7 +3494,8 @@ $result_sectioning{'htmlxref_only_split'} = {
                   'extra' => {
                     'normalized' => 'other-nodes',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3527,68 +3534,6 @@ $result_nodes{'htmlxref_only_split'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -3604,18 +3549,90 @@ $result_nodes{'htmlxref_only_split'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'other-nodes',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
+            }
+          }
+        }
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref_only_split'}{'menu_child'};
-$result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref_only_split'}{'menu_child'};
-$result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'node_prev'} 
= $result_nodes{'htmlxref_only_split'}{'menu_child'};
-$result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'htmlxref_only_split'}{'menu_child'};
-$result_nodes{'htmlxref_only_split'}{'menu_child'}{'node_next'} = 
$result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref_only_split'}{'menu_child'}{'node_prev'} = 
$result_nodes{'htmlxref_only_split'};
-$result_nodes{'htmlxref_only_split'}{'menu_child'}{'node_up'} = 
$result_nodes{'htmlxref_only_split'};
-$result_nodes{'htmlxref_only_split'}{'node_next'} = 
$result_nodes{'htmlxref_only_split'}{'menu_child'};
+$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = 
$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref_only_split'};
+$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_split'};
+$result_nodes{'htmlxref_only_split'}{'structure'}{'node_next'} = 
$result_nodes{'htmlxref_only_split'}{'structure'}{'menu_child'};
 
 $result_menus{'htmlxref_only_split'} = {
   'cmdname' => 'node',
@@ -3623,59 +3640,69 @@ $result_menus{'htmlxref_only_split'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+        'normalized' => 'other-nodes',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'other-nodes' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'other-nodes' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'other-nodes' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'other-nodes' => 1
+            }
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'other-nodes' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'other-nodes' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref_only_split'}{'menu_child'};
-$result_menus{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'htmlxref_only_split'}{'menu_child'}{'menu_child'};
-$result_menus{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref_only_split'}{'menu_child'};
-$result_menus{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'htmlxref_only_split'}{'menu_child'};
-$result_menus{'htmlxref_only_split'}{'menu_child'}{'menu_up'} = 
$result_menus{'htmlxref_only_split'};
+$result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_split'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_split'};
 
 $result_errors{'htmlxref_only_split'} = [];
 
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index a43efed307..27137924ce 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -105,7 +105,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1415,7 +1416,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                     'line_nr' => 85,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -1717,7 +1719,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                     'line_nr' => 90,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2160,7 +2163,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                     'line_nr' => 95,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -2363,7 +2367,8 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3473,7 +3478,8 @@ $result_sectioning{'htmlxref_only_split_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3488,7 +3494,8 @@ $result_sectioning{'htmlxref_only_split_nodes'} = {
                   'extra' => {
                     'normalized' => 'other-nodes',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3527,68 +3534,6 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -3604,18 +3549,90 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'other-nodes',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
+            }
+          }
+        }
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref_only_split_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'htmlxref_only_split_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'node_prev'}
 = $result_nodes{'htmlxref_only_split_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'htmlxref_only_split_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'node_next'} = 
$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'htmlxref_only_split_nodes'};
-$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'htmlxref_only_split_nodes'};
-$result_nodes{'htmlxref_only_split_nodes'}{'node_next'} = 
$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'};
+$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = 
$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'htmlxref_only_split_nodes'};
+$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'htmlxref_only_split_nodes'};
+$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'htmlxref_only_split_nodes'} = {
   'cmdname' => 'node',
@@ -3623,59 +3640,69 @@ $result_menus{'htmlxref_only_split_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+        'normalized' => 'other-nodes',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'other-nodes' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'other-nodes' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'other-nodes' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'other-nodes' => 1
+            }
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'other-nodes' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'other-nodes' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref_only_split_nodes'}{'menu_child'};
-$result_menus{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'htmlxref_only_split_nodes'}{'menu_child'};
-$result_menus{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'htmlxref_only_split_nodes'}{'menu_child'};
-$result_menus{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'htmlxref_only_split_nodes'};
+$result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'};
+$result_menus{'htmlxref_only_split_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'htmlxref_only_split_nodes'};
 
 $result_errors{'htmlxref_only_split_nodes'} = [];
 
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index 628dcaa426..dbc518d265 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -693,7 +693,8 @@ $result_trees{'cpp_lines'} = {
         'line_nr' => 70,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -915,7 +916,8 @@ $result_nodes{'cpp_lines'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'cpp_lines'} = {
@@ -923,7 +925,8 @@ $result_menus{'cpp_lines'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'cpp_lines'} = [];
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl 
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 3a326ac8c1..e287a3aed7 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -275,7 +275,8 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -544,7 +545,8 @@ $result_sectioning{'macro_and_commands_in_early_commands'} 
= {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -572,7 +574,8 @@ $result_nodes{'macro_and_commands_in_early_commands'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'macro_and_commands_in_early_commands'} = {
@@ -580,7 +583,8 @@ $result_menus{'macro_and_commands_in_early_commands'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'macro_and_commands_in_early_commands'} = [
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index 7278269b4f..67603e8976 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -354,7 +354,8 @@ $result_trees{'macro_in_early_commands'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -639,7 +640,8 @@ $result_sectioning{'macro_in_early_commands'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -667,7 +669,8 @@ $result_nodes{'macro_in_early_commands'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'macro_in_early_commands'} = {
@@ -675,7 +678,8 @@ $result_menus{'macro_in_early_commands'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'macro_in_early_commands'} = [];
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index f58b82691a..3199d3231b 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -464,7 +464,8 @@ $result_trees{'value_expansion_in_include'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -583,7 +584,8 @@ $result_nodes{'value_expansion_in_include'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'value_expansion_in_include'} = {
@@ -591,7 +593,8 @@ $result_menus{'value_expansion_in_include'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'value_expansion_in_include'} = [
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index 8503ec75d5..747af6b602 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -908,7 +908,8 @@ $result_trees{'complex_recursive_synindex'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -1094,7 +1095,8 @@ $result_nodes{'complex_recursive_synindex'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'complex_recursive_synindex'} = {
@@ -1103,7 +1105,8 @@ $result_menus{'complex_recursive_synindex'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'complex_recursive_synindex'} = [
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index 852769beee..4d764c074a 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -125,7 +125,8 @@ $result_trees{'def_syn_indices'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -206,7 +207,8 @@ $result_trees{'def_syn_indices'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1699,7 +1701,8 @@ $result_sectioning{'def_syn_indices'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1715,7 +1718,8 @@ $result_sectioning{'def_syn_indices'} = {
                     'isindex' => 1,
                     'normalized' => 'Chapter-index',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1754,36 +1758,41 @@ $result_nodes{'def_syn_indices'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'isindex' => 1,
+        'normalized' => 'Chapter-index',
+        'spaces_before_argument' => ' '
       },
-      'isindex' => 1,
-      'normalized' => 'Chapter-index',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'def_syn_indices'}{'node_next'}{'node_prev'} = 
$result_nodes{'def_syn_indices'};
-$result_nodes{'def_syn_indices'}{'node_next'}{'node_up'} = 
$result_nodes{'def_syn_indices'};
+$result_nodes{'def_syn_indices'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'def_syn_indices'};
+$result_nodes{'def_syn_indices'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'def_syn_indices'};
 
 $result_menus{'def_syn_indices'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'def_syn_indices'} = [
diff --git 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index cac197ef32..bd80948c6c 100644
--- a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
+++ b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
@@ -216,7 +216,8 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -273,7 +274,8 @@ 
$result_nodes{'default_cp_index_and_one_letter_syncodeindex'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'default_cp_index_and_one_letter_syncodeindex'} = {
@@ -282,7 +284,8 @@ 
$result_menus{'default_cp_index_and_one_letter_syncodeindex'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'default_cp_index_and_one_letter_syncodeindex'} = [];
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index 7a6c252baf..becc3baed2 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -285,7 +285,8 @@ $result_trees{'double_index_entry'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -440,7 +441,8 @@ $result_trees{'double_index_entry'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -549,16 +551,6 @@ $result_nodes{'double_index_entry'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'other-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -574,11 +566,25 @@ $result_nodes{'double_index_entry'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'other-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'double_index_entry'}{'menu_child'}{'node_prev'} = 
$result_nodes{'double_index_entry'};
-$result_nodes{'double_index_entry'}{'menu_child'}{'node_up'} = 
$result_nodes{'double_index_entry'};
-$result_nodes{'double_index_entry'}{'node_next'} = 
$result_nodes{'double_index_entry'}{'menu_child'};
+$result_nodes{'double_index_entry'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'double_index_entry'};
+$result_nodes{'double_index_entry'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'double_index_entry'};
+$result_nodes{'double_index_entry'}{'structure'}{'node_next'} = 
$result_nodes{'double_index_entry'}{'structure'}{'menu_child'};
 
 $result_menus{'double_index_entry'} = {
   'cmdname' => 'node',
@@ -586,20 +592,24 @@ $result_menus{'double_index_entry'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'other-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'other-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'double_index_entry'}{'menu_child'}{'menu_up'} = 
$result_menus{'double_index_entry'};
+$result_menus{'double_index_entry'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'double_index_entry'};
 
 $result_errors{'double_index_entry'} = [];
 
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index abc15a4140..ae45734a53 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -87,7 +87,8 @@ $result_trees{'double_seeentry_seealso'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -168,7 +169,8 @@ $result_trees{'double_seeentry_seealso'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -787,7 +789,8 @@ $result_sectioning{'double_seeentry_seealso'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -803,7 +806,8 @@ $result_sectioning{'double_seeentry_seealso'} = {
                     'isindex' => 1,
                     'normalized' => 'node-index',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -842,36 +846,41 @@ $result_nodes{'double_seeentry_seealso'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'isindex' => 1,
+        'normalized' => 'node-index',
+        'spaces_before_argument' => ' '
       },
-      'isindex' => 1,
-      'normalized' => 'node-index',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'double_seeentry_seealso'}{'node_next'}{'node_prev'} = 
$result_nodes{'double_seeentry_seealso'};
-$result_nodes{'double_seeentry_seealso'}{'node_next'}{'node_up'} = 
$result_nodes{'double_seeentry_seealso'};
+$result_nodes{'double_seeentry_seealso'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'double_seeentry_seealso'};
+$result_nodes{'double_seeentry_seealso'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'double_seeentry_seealso'};
 
 $result_menus{'double_seeentry_seealso'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'double_seeentry_seealso'} = [];
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index 61f251dbc6..289519eb2f 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -280,7 +280,8 @@ $result_trees{'double_syncodeindex'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -345,7 +346,8 @@ $result_nodes{'double_syncodeindex'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'double_syncodeindex'} = {
@@ -354,7 +356,8 @@ $result_menus{'double_syncodeindex'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'double_syncodeindex'} = [
diff --git a/tp/t/results/indices/empty_cindex_entry.pl 
b/tp/t/results/indices/empty_cindex_entry.pl
index 5473e001de..7dc17864e8 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -75,7 +75,8 @@ $result_trees{'empty_cindex_entry'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -101,7 +102,8 @@ $result_nodes{'empty_cindex_entry'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'empty_cindex_entry'} = {
@@ -109,7 +111,8 @@ $result_menus{'empty_cindex_entry'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'empty_cindex_entry'} = [
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 7c86740658..70a22efeae 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -210,7 +210,8 @@ $result_trees{'empty_index_entry'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -260,7 +261,8 @@ $result_nodes{'empty_index_entry'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'empty_index_entry'} = {
@@ -269,7 +271,8 @@ $result_menus{'empty_index_entry'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'empty_index_entry'} = [
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 345c9751a6..6b0cb29cd5 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -631,7 +631,8 @@ $result_trees{'empty_string_index_entry'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -750,7 +751,8 @@ $result_nodes{'empty_string_index_entry'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'empty_string_index_entry'} = {
@@ -759,7 +761,8 @@ $result_menus{'empty_string_index_entry'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'empty_string_index_entry'} = [
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 4a5b833dfc..60b701cf1b 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -125,7 +125,8 @@ $result_trees{'encoding_index_ascii'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3550,7 +3551,8 @@ $result_sectioning{'encoding_index_ascii'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3579,7 +3581,8 @@ $result_nodes{'encoding_index_ascii'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'encoding_index_ascii'} = {
@@ -3588,7 +3591,8 @@ $result_menus{'encoding_index_ascii'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'encoding_index_ascii'} = [];
diff --git a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
index 117c6ecf8c..36c54005e6 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -125,7 +125,8 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3550,7 +3551,8 @@ 
$result_sectioning{'encoding_index_ascii_enable_encoding'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3579,7 +3581,8 @@ $result_nodes{'encoding_index_ascii_enable_encoding'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'encoding_index_ascii_enable_encoding'} = {
@@ -3588,7 +3591,8 @@ $result_menus{'encoding_index_ascii_enable_encoding'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'encoding_index_ascii_enable_encoding'} = [];
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index a59a8d1549..767d8ee7af 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -137,7 +137,8 @@ $result_trees{'encoding_index_latin1'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3528,7 +3529,8 @@ $result_sectioning{'encoding_index_latin1'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3557,7 +3559,8 @@ $result_nodes{'encoding_index_latin1'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'encoding_index_latin1'} = {
@@ -3566,7 +3569,8 @@ $result_menus{'encoding_index_latin1'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'encoding_index_latin1'} = [];
diff --git a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
index a2cacbf83f..1e3ccea875 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -137,7 +137,8 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3528,7 +3529,8 @@ 
$result_sectioning{'encoding_index_latin1_enable_encoding'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3557,7 +3559,8 @@ $result_nodes{'encoding_index_latin1_enable_encoding'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'encoding_index_latin1_enable_encoding'} = {
@@ -3566,7 +3569,8 @@ $result_menus{'encoding_index_latin1_enable_encoding'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'encoding_index_latin1_enable_encoding'} = [];
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index 3f4d361c5d..dc4b5fe8e6 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -137,7 +137,8 @@ $result_trees{'encoding_index_utf8'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3528,7 +3529,8 @@ $result_sectioning{'encoding_index_utf8'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3557,7 +3559,8 @@ $result_nodes{'encoding_index_utf8'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'encoding_index_utf8'} = {
@@ -3566,7 +3569,8 @@ $result_menus{'encoding_index_utf8'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'encoding_index_utf8'} = [];
diff --git a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
index 79d11605b6..da5975f3d2 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -137,7 +137,8 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3528,7 +3529,8 @@ $result_sectioning{'encoding_index_utf8_enable_encoding'} 
= {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3557,7 +3559,8 @@ $result_nodes{'encoding_index_utf8_enable_encoding'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'encoding_index_utf8_enable_encoding'} = {
@@ -3566,7 +3569,8 @@ $result_menus{'encoding_index_utf8_enable_encoding'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'encoding_index_utf8_enable_encoding'} = [];
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 96b5b4d00a..3e9f31cb23 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -52,7 +52,8 @@ $result_trees{'explicit_sort_key'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -814,7 +815,8 @@ $result_sectioning{'explicit_sort_key'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -840,7 +842,8 @@ $result_nodes{'explicit_sort_key'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'explicit_sort_key'} = {
@@ -849,7 +852,8 @@ $result_menus{'explicit_sort_key'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'explicit_sort_key'} = [
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index 8e9779bd15..30dcad1580 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -676,7 +676,8 @@ $result_trees{'ftable_vtable'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -831,7 +832,8 @@ $result_nodes{'ftable_vtable'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'ftable_vtable'} = {
@@ -840,7 +842,8 @@ $result_menus{'ftable_vtable'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'ftable_vtable'} = [];
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index e085a779b6..c758a76caf 100644
--- a/tp/t/results/indices/image_lines_count.pl
+++ b/tp/t/results/indices/image_lines_count.pl
@@ -173,7 +173,8 @@ $result_trees{'image_lines_count'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -224,7 +225,8 @@ $result_nodes{'image_lines_count'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'image_lines_count'} = {
@@ -233,7 +235,8 @@ $result_menus{'image_lines_count'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'image_lines_count'} = [];
diff --git a/tp/t/results/indices/image_text_lines_count.pl 
b/tp/t/results/indices/image_text_lines_count.pl
index d4dd52d273..f1f6cb02ee 100644
--- a/tp/t/results/indices/image_text_lines_count.pl
+++ b/tp/t/results/indices/image_text_lines_count.pl
@@ -173,7 +173,8 @@ $result_trees{'image_text_lines_count'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -224,7 +225,8 @@ $result_nodes{'image_text_lines_count'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'image_text_lines_count'} = {
@@ -233,7 +235,8 @@ $result_menus{'image_text_lines_count'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'image_text_lines_count'} = [];
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index ec0741808a..91f8e502ad 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -357,7 +357,8 @@ $result_trees{'index_entries_locations'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -464,7 +465,8 @@ $result_nodes{'index_entries_locations'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'index_entries_locations'} = {
@@ -473,7 +475,8 @@ $result_menus{'index_entries_locations'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'index_entries_locations'} = [];
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl 
b/tp/t/results/indices/index_entry_before_first_node.pl
index 6481b94242..2c72d27a52 100644
Binary files a/tp/t/results/indices/index_entry_before_first_node.pl and 
b/tp/t/results/indices/index_entry_before_first_node.pl differ
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index b2e90852b0..1434515430 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -231,7 +231,8 @@ $result_trees{'index_entry_before_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -381,7 +382,8 @@ $result_trees{'index_entry_before_node'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -499,7 +501,8 @@ $result_trees{'index_entry_before_node'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -616,25 +619,6 @@ $result_nodes{'index_entry_before_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'isindex' => 1,
-        'normalized' => 'second',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -650,13 +634,38 @@ $result_nodes{'index_entry_before_node'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 'second',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'index_entry_before_node'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'index_entry_before_node'}{'menu_child'};
-$result_nodes{'index_entry_before_node'}{'menu_child'}{'node_next'}{'node_up'} 
= $result_nodes{'index_entry_before_node'};
-$result_nodes{'index_entry_before_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'index_entry_before_node'};
-$result_nodes{'index_entry_before_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'index_entry_before_node'};
-$result_nodes{'index_entry_before_node'}{'node_next'} = 
$result_nodes{'index_entry_before_node'}{'menu_child'};
+$result_nodes{'index_entry_before_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'index_entry_before_node'}{'structure'}{'menu_child'};
+$result_nodes{'index_entry_before_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_entry_before_node'};
+$result_nodes{'index_entry_before_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'index_entry_before_node'};
+$result_nodes{'index_entry_before_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'index_entry_before_node'};
+$result_nodes{'index_entry_before_node'}{'structure'}{'node_next'} = 
$result_nodes{'index_entry_before_node'}{'structure'}{'menu_child'};
 
 $result_menus{'index_entry_before_node'} = {
   'cmdname' => 'node',
@@ -664,34 +673,40 @@ $result_menus{'index_entry_before_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'isindex' => 1,
-        'normalized' => 'second',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 'second',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'index_entry_before_node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'index_entry_before_node'}{'menu_child'};
-$result_menus{'index_entry_before_node'}{'menu_child'}{'menu_next'}{'menu_up'} 
= $result_menus{'index_entry_before_node'};
-$result_menus{'index_entry_before_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'index_entry_before_node'};
+$result_menus{'index_entry_before_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'index_entry_before_node'}{'structure'}{'menu_child'};
+$result_menus{'index_entry_before_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_entry_before_node'};
+$result_menus{'index_entry_before_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'index_entry_before_node'};
 
 $result_errors{'index_entry_before_node'} = [];
 
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index 59cd056117..ed0d7dd84d 100644
--- a/tp/t/results/indices/index_entry_in_footnote.pl
+++ b/tp/t/results/indices/index_entry_in_footnote.pl
@@ -181,7 +181,8 @@ $result_trees{'index_entry_in_footnote'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -233,7 +234,8 @@ $result_nodes{'index_entry_in_footnote'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'index_entry_in_footnote'} = {
@@ -242,7 +244,8 @@ $result_menus{'index_entry_in_footnote'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'index_entry_in_footnote'} = [];
diff --git a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl 
b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
index 2d3e880d0b..9b2f198a22 100644
--- a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
@@ -346,7 +346,8 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -426,7 +427,8 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -531,16 +533,6 @@ 
$result_nodes{'index_entry_in_footnote_different_node_end'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'First',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -556,11 +548,25 @@ 
$result_nodes{'index_entry_in_footnote_different_node_end'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'First',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'index_entry_in_footnote_different_node_end'}{'menu_child'}{'node_prev'}
 = $result_nodes{'index_entry_in_footnote_different_node_end'};
-$result_nodes{'index_entry_in_footnote_different_node_end'}{'menu_child'}{'node_up'}
 = $result_nodes{'index_entry_in_footnote_different_node_end'};
-$result_nodes{'index_entry_in_footnote_different_node_end'}{'node_next'} = 
$result_nodes{'index_entry_in_footnote_different_node_end'}{'menu_child'};
+$result_nodes{'index_entry_in_footnote_different_node_end'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'index_entry_in_footnote_different_node_end'};
+$result_nodes{'index_entry_in_footnote_different_node_end'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'index_entry_in_footnote_different_node_end'};
+$result_nodes{'index_entry_in_footnote_different_node_end'}{'structure'}{'node_next'}
 = 
$result_nodes{'index_entry_in_footnote_different_node_end'}{'structure'}{'menu_child'};
 
 $result_menus{'index_entry_in_footnote_different_node_end'} = {
   'cmdname' => 'node',
@@ -568,20 +574,24 @@ 
$result_menus{'index_entry_in_footnote_different_node_end'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'First',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'First',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'index_entry_in_footnote_different_node_end'}{'menu_child'}{'menu_up'}
 = $result_menus{'index_entry_in_footnote_different_node_end'};
+$result_menus{'index_entry_in_footnote_different_node_end'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'index_entry_in_footnote_different_node_end'};
 
 $result_errors{'index_entry_in_footnote_different_node_end'} = [];
 
diff --git a/tp/t/results/indices/index_entry_in_footnote_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_separate.pl
index e64f8b604e..fe8dd0a8e1 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -378,7 +378,8 @@ $result_trees{'index_entry_in_footnote_separate'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -458,7 +459,8 @@ $result_trees{'index_entry_in_footnote_separate'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -567,16 +569,6 @@ $result_nodes{'index_entry_in_footnote_separate'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'First',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -592,11 +584,25 @@ $result_nodes{'index_entry_in_footnote_separate'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'First',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'index_entry_in_footnote_separate'}{'menu_child'}{'node_prev'} = 
$result_nodes{'index_entry_in_footnote_separate'};
-$result_nodes{'index_entry_in_footnote_separate'}{'menu_child'}{'node_up'} = 
$result_nodes{'index_entry_in_footnote_separate'};
-$result_nodes{'index_entry_in_footnote_separate'}{'node_next'} = 
$result_nodes{'index_entry_in_footnote_separate'}{'menu_child'};
+$result_nodes{'index_entry_in_footnote_separate'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'index_entry_in_footnote_separate'};
+$result_nodes{'index_entry_in_footnote_separate'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'index_entry_in_footnote_separate'};
+$result_nodes{'index_entry_in_footnote_separate'}{'structure'}{'node_next'} = 
$result_nodes{'index_entry_in_footnote_separate'}{'structure'}{'menu_child'};
 
 $result_menus{'index_entry_in_footnote_separate'} = {
   'cmdname' => 'node',
@@ -604,20 +610,24 @@ $result_menus{'index_entry_in_footnote_separate'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'First',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'First',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'index_entry_in_footnote_separate'}{'menu_child'}{'menu_up'} = 
$result_menus{'index_entry_in_footnote_separate'};
+$result_menus{'index_entry_in_footnote_separate'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'index_entry_in_footnote_separate'};
 
 $result_errors{'index_entry_in_footnote_separate'} = [];
 
diff --git a/tp/t/results/indices/print_merged_index.pl 
b/tp/t/results/indices/print_merged_index.pl
index 527e98079b..ad89a2e818 100644
--- a/tp/t/results/indices/print_merged_index.pl
+++ b/tp/t/results/indices/print_merged_index.pl
@@ -113,7 +113,8 @@ $result_trees{'print_merged_index'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -144,7 +145,8 @@ $result_nodes{'print_merged_index'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'print_merged_index'} = {
@@ -153,7 +155,8 @@ $result_menus{'print_merged_index'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'print_merged_index'} = [
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 732e3f7ae5..ee901a25d1 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -624,7 +624,8 @@ $result_trees{'printindex_index_entry_in_copying'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -855,7 +856,8 @@ $result_trees{'printindex_index_entry_in_copying'} = {
         'line_nr' => 29,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1160,7 +1162,8 @@ $result_sectioning{'printindex_index_entry_in_copying'} = 
{
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1176,7 +1179,8 @@ $result_sectioning{'printindex_index_entry_in_copying'} = 
{
                     'isindex' => 1,
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1215,26 +1219,6 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'isindex' => 1,
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1250,11 +1234,35 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'isindex' => 1,
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'printindex_index_entry_in_copying'}{'menu_child'}{'node_prev'} 
= $result_nodes{'printindex_index_entry_in_copying'};
-$result_nodes{'printindex_index_entry_in_copying'}{'menu_child'}{'node_up'} = 
$result_nodes{'printindex_index_entry_in_copying'};
-$result_nodes{'printindex_index_entry_in_copying'}{'node_next'} = 
$result_nodes{'printindex_index_entry_in_copying'}{'menu_child'};
+$result_nodes{'printindex_index_entry_in_copying'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'printindex_index_entry_in_copying'};
+$result_nodes{'printindex_index_entry_in_copying'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'printindex_index_entry_in_copying'};
+$result_nodes{'printindex_index_entry_in_copying'}{'structure'}{'node_next'} = 
$result_nodes{'printindex_index_entry_in_copying'}{'structure'}{'menu_child'};
 
 $result_menus{'printindex_index_entry_in_copying'} = {
   'cmdname' => 'node',
@@ -1262,20 +1270,24 @@ $result_menus{'printindex_index_entry_in_copying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'printindex_index_entry_in_copying'}{'menu_child'}{'menu_up'} = 
$result_menus{'printindex_index_entry_in_copying'};
+$result_menus{'printindex_index_entry_in_copying'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'printindex_index_entry_in_copying'};
 
 $result_errors{'printindex_index_entry_in_copying'} = [];
 
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
index f4e56e6150..623e73db9a 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
@@ -255,7 +255,8 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -485,7 +486,8 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -684,7 +686,8 @@ 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -699,7 +702,8 @@ 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -738,25 +742,6 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -772,11 +757,34 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'menu_child'}{'node_prev'}
 = $result_nodes{'printindex_index_entry_in_copying_in_footnote'};
-$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'menu_child'}{'node_up'}
 = $result_nodes{'printindex_index_entry_in_copying_in_footnote'};
-$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'node_next'} = 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'menu_child'};
+$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'printindex_index_entry_in_copying_in_footnote'};
+$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'printindex_index_entry_in_copying_in_footnote'};
+$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'structure'}{'node_next'}
 = 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'structure'}{'menu_child'};
 
 $result_menus{'printindex_index_entry_in_copying_in_footnote'} = {
   'cmdname' => 'node',
@@ -784,19 +792,23 @@ 
$result_menus{'printindex_index_entry_in_copying_in_footnote'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'printindex_index_entry_in_copying_in_footnote'}{'menu_child'}{'menu_up'}
 = $result_menus{'printindex_index_entry_in_copying_in_footnote'};
+$result_menus{'printindex_index_entry_in_copying_in_footnote'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'printindex_index_entry_in_copying_in_footnote'};
 
 $result_errors{'printindex_index_entry_in_copying_in_footnote'} = [];
 
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index 69073a607c..d52db726cf 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -624,7 +624,8 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -838,7 +839,8 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
         'line_nr' => 28,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1120,7 +1122,8 @@ 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1136,7 +1139,8 @@ 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1175,26 +1179,6 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'isindex' => 1,
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1210,11 +1194,35 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'isindex' => 1,
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'menu_child'}{'node_prev'}
 = $result_nodes{'printindex_index_entry_in_copying_no_insertcopying'};
-$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'menu_child'}{'node_up'}
 = $result_nodes{'printindex_index_entry_in_copying_no_insertcopying'};
-$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'node_next'}
 = 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'menu_child'};
+$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'printindex_index_entry_in_copying_no_insertcopying'};
+$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'printindex_index_entry_in_copying_no_insertcopying'};
+$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'structure'}{'node_next'}
 = 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'structure'}{'menu_child'};
 
 $result_menus{'printindex_index_entry_in_copying_no_insertcopying'} = {
   'cmdname' => 'node',
@@ -1222,20 +1230,24 @@ 
$result_menus{'printindex_index_entry_in_copying_no_insertcopying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'printindex_index_entry_in_copying_no_insertcopying'}{'menu_child'}{'menu_up'}
 = $result_menus{'printindex_index_entry_in_copying_no_insertcopying'};
+$result_menus{'printindex_index_entry_in_copying_no_insertcopying'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'printindex_index_entry_in_copying_no_insertcopying'};
 
 $result_errors{'printindex_index_entry_in_copying_no_insertcopying'} = [];
 
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index cc1a42e50b..84a2336a9f 100644
Binary files a/tp/t/results/indices/printindex_with_space_before.pl and 
b/tp/t/results/indices/printindex_with_space_before.pl differ
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index dcb5edac68..a4c07c50d3 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -91,7 +91,8 @@ $result_trees{'same_index_entry_merged_indices'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -606,7 +607,8 @@ $result_sectioning{'same_index_entry_merged_indices'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -632,7 +634,8 @@ $result_nodes{'same_index_entry_merged_indices'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'same_index_entry_merged_indices'} = {
@@ -641,7 +644,8 @@ $result_menus{'same_index_entry_merged_indices'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'same_index_entry_merged_indices'} = [];
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index e32ad11723..90318e6550 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -322,7 +322,8 @@ $result_trees{'seealso_duplicate'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -392,7 +393,8 @@ $result_nodes{'seealso_duplicate'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'seealso_duplicate'} = {
@@ -401,7 +403,8 @@ $result_menus{'seealso_duplicate'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'seealso_duplicate'} = [];
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 443f78920b..f837c1ec51 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -87,7 +87,8 @@ $result_trees{'seeentry'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -161,7 +162,8 @@ $result_trees{'seeentry'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -671,7 +673,8 @@ $result_sectioning{'seeentry'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -686,7 +689,8 @@ $result_sectioning{'seeentry'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-index',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -723,36 +727,41 @@ $result_nodes{'seeentry'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'isindex' => 1,
+        'normalized' => 'chapter-index',
+        'spaces_before_argument' => ' '
       },
-      'isindex' => 1,
-      'normalized' => 'chapter-index',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'seeentry'}{'node_next'}{'node_prev'} = 
$result_nodes{'seeentry'};
-$result_nodes{'seeentry'}{'node_next'}{'node_up'} = $result_nodes{'seeentry'};
+$result_nodes{'seeentry'}{'structure'}{'node_next'}{'structure'}{'node_prev'} 
= $result_nodes{'seeentry'};
+$result_nodes{'seeentry'}{'structure'}{'node_next'}{'structure'}{'node_up'} = 
$result_nodes{'seeentry'};
 
 $result_menus{'seeentry'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'seeentry'} = [];
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index bc93f7fd5e..0d77b39cf1 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -87,7 +87,8 @@ $result_trees{'subentries'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -161,7 +162,8 @@ $result_trees{'subentries'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1135,7 +1137,8 @@ $result_sectioning{'subentries'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -1150,7 +1153,8 @@ $result_sectioning{'subentries'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-index',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1187,36 +1191,41 @@ $result_nodes{'subentries'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'isindex' => 1,
+        'normalized' => 'chapter-index',
+        'spaces_before_argument' => ' '
       },
-      'isindex' => 1,
-      'normalized' => 'chapter-index',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'subentries'}{'node_next'}{'node_prev'} = 
$result_nodes{'subentries'};
-$result_nodes{'subentries'}{'node_next'}{'node_up'} = 
$result_nodes{'subentries'};
+$result_nodes{'subentries'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'subentries'};
+$result_nodes{'subentries'}{'structure'}{'node_next'}{'structure'}{'node_up'} 
= $result_nodes{'subentries'};
 
 $result_menus{'subentries'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'subentries'} = [
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index 6f9ca4cd21..fd4dcba347 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -87,7 +87,8 @@ $result_trees{'subentry_and_sortas'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -161,7 +162,8 @@ $result_trees{'subentry_and_sortas'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -641,7 +643,8 @@ $result_sectioning{'subentry_and_sortas'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -656,7 +659,8 @@ $result_sectioning{'subentry_and_sortas'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-index',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -693,36 +697,41 @@ $result_nodes{'subentry_and_sortas'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'isindex' => 1,
+        'normalized' => 'chapter-index',
+        'spaces_before_argument' => ' '
       },
-      'isindex' => 1,
-      'normalized' => 'chapter-index',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'subentry_and_sortas'}{'node_next'}{'node_prev'} = 
$result_nodes{'subentry_and_sortas'};
-$result_nodes{'subentry_and_sortas'}{'node_next'}{'node_up'} = 
$result_nodes{'subentry_and_sortas'};
+$result_nodes{'subentry_and_sortas'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'subentry_and_sortas'};
+$result_nodes{'subentry_and_sortas'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'subentry_and_sortas'};
 
 $result_menus{'subentry_and_sortas'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'subentry_and_sortas'} = [];
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index e367d28593..ab95d6d257 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -125,7 +125,8 @@ $result_trees{'syncode_index_print_both'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -206,7 +207,8 @@ $result_trees{'syncode_index_print_both'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -566,7 +568,8 @@ $result_sectioning{'syncode_index_print_both'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -582,7 +585,8 @@ $result_sectioning{'syncode_index_print_both'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter-index',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -621,36 +625,41 @@ $result_nodes{'syncode_index_print_both'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'isindex' => 1,
+        'normalized' => 'chapter-index',
+        'spaces_before_argument' => ' '
       },
-      'isindex' => 1,
-      'normalized' => 'chapter-index',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'syncode_index_print_both'}{'node_next'}{'node_prev'} = 
$result_nodes{'syncode_index_print_both'};
-$result_nodes{'syncode_index_print_both'}{'node_next'}{'node_up'} = 
$result_nodes{'syncode_index_print_both'};
+$result_nodes{'syncode_index_print_both'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'syncode_index_print_both'};
+$result_nodes{'syncode_index_print_both'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'syncode_index_print_both'};
 
 $result_menus{'syncode_index_print_both'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'syncode_index_print_both'} = [
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index fcf500f7c2..edf74d7417 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -317,7 +317,8 @@ $result_trees{'syncodeindex_to_plain'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -397,7 +398,8 @@ $result_nodes{'syncodeindex_to_plain'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'syncodeindex_to_plain'} = {
@@ -406,7 +408,8 @@ $result_menus{'syncodeindex_to_plain'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'syncodeindex_to_plain'} = [];
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index 4a341d6781..83a05ee5aa 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -83,7 +83,8 @@ $result_trees{'transparent_sort_chars'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -406,7 +407,8 @@ $result_sectioning{'transparent_sort_chars'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -432,7 +434,8 @@ $result_nodes{'transparent_sort_chars'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'transparent_sort_chars'} = {
@@ -441,7 +444,8 @@ $result_menus{'transparent_sort_chars'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'transparent_sort_chars'} = [];
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index e220a63002..bddcc1b780 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -52,7 +52,8 @@ $result_trees{'w_lines_count'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -361,7 +362,8 @@ $result_sectioning{'w_lines_count'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -387,7 +389,8 @@ $result_nodes{'w_lines_count'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'w_lines_count'} = {
@@ -396,7 +399,8 @@ $result_menus{'w_lines_count'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'w_lines_count'} = [];
diff --git a/tp/t/results/info_tests/anchor_and_spaces.pl 
b/tp/t/results/info_tests/anchor_and_spaces.pl
index fb2865fb65..9f28fa8558 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -51,7 +51,8 @@ $result_trees{'anchor_and_spaces'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -282,7 +283,8 @@ $result_sectioning{'anchor_and_spaces'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -310,7 +312,8 @@ $result_nodes{'anchor_and_spaces'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'anchor_and_spaces'} = {
@@ -318,7 +321,8 @@ $result_menus{'anchor_and_spaces'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'anchor_and_spaces'} = [];
diff --git a/tp/t/results/info_tests/anchor_in_command.pl 
b/tp/t/results/info_tests/anchor_in_command.pl
index 6207f5423e..f7642b630b 100644
--- a/tp/t/results/info_tests/anchor_in_command.pl
+++ b/tp/t/results/info_tests/anchor_in_command.pl
@@ -211,7 +211,8 @@ $result_trees{'anchor_in_command'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -264,7 +265,8 @@ $result_nodes{'anchor_in_command'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'anchor_in_command'} = {
@@ -272,7 +274,8 @@ $result_menus{'anchor_in_command'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'anchor_in_command'} = [];
diff --git a/tp/t/results/info_tests/before_node_and_section.pl 
b/tp/t/results/info_tests/before_node_and_section.pl
index c700cf40d3..6dba07e7de 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -75,7 +75,8 @@ $result_trees{'before_node_and_section'} = {
                     'line_nr' => 11,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -641,7 +642,8 @@ $result_trees{'before_node_and_section'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -889,7 +891,8 @@ $result_sectioning{'before_node_and_section'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -905,7 +908,8 @@ $result_sectioning{'before_node_and_section'} = {
                     'isindex' => 1,
                     'normalized' => 'node1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -944,26 +948,6 @@ $result_nodes{'before_node_and_section'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'isindex' => 1,
-      'normalized' => 'node1',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -979,11 +963,35 @@ $result_nodes{'before_node_and_section'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'isindex' => 1,
+        'normalized' => 'node1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'before_node_and_section'}{'menu_child'}{'node_prev'} = 
$result_nodes{'before_node_and_section'};
-$result_nodes{'before_node_and_section'}{'menu_child'}{'node_up'} = 
$result_nodes{'before_node_and_section'};
-$result_nodes{'before_node_and_section'}{'node_next'} = 
$result_nodes{'before_node_and_section'}{'menu_child'};
+$result_nodes{'before_node_and_section'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'before_node_and_section'};
+$result_nodes{'before_node_and_section'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'before_node_and_section'};
+$result_nodes{'before_node_and_section'}{'structure'}{'node_next'} = 
$result_nodes{'before_node_and_section'}{'structure'}{'menu_child'};
 
 $result_menus{'before_node_and_section'} = {
   'cmdname' => 'node',
@@ -991,20 +999,24 @@ $result_menus{'before_node_and_section'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'node1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'node1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'before_node_and_section'}{'menu_child'}{'menu_up'} = 
$result_menus{'before_node_and_section'};
+$result_menus{'before_node_and_section'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'before_node_and_section'};
 
 $result_errors{'before_node_and_section'} = [
   {
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl 
b/tp/t/results/info_tests/colon_in_index_entry.pl
index 8b28c4bc16..50570044fa 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -618,7 +618,8 @@ $result_trees{'colon_in_index_entry'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -742,7 +743,8 @@ $result_nodes{'colon_in_index_entry'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'colon_in_index_entry'} = {
@@ -751,7 +753,8 @@ $result_menus{'colon_in_index_entry'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'colon_in_index_entry'} = [];
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index 4f9c92fc83..1b61c6a8b8 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -116,7 +116,8 @@ $result_trees{'def_in_copying'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -915,7 +916,8 @@ $result_sectioning{'def_in_copying'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -944,7 +946,8 @@ $result_nodes{'def_in_copying'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'def_in_copying'} = {
@@ -953,7 +956,8 @@ $result_menus{'def_in_copying'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'def_in_copying'} = [];
diff --git a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl 
b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
index 2b1b80295c..92d033cc5a 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -455,7 +455,8 @@ $result_trees{'direntry_dircategory_and_commands'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -634,7 +635,8 @@ $result_sectioning{'direntry_dircategory_and_commands'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -662,7 +664,8 @@ $result_nodes{'direntry_dircategory_and_commands'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'direntry_dircategory_and_commands'} = {
@@ -670,7 +673,8 @@ $result_menus{'direntry_dircategory_and_commands'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'direntry_dircategory_and_commands'} = [];
diff --git a/tp/t/results/info_tests/encoding_us_ascii.pl 
b/tp/t/results/info_tests/encoding_us_ascii.pl
index 7730a2846a..37b75b95cd 100644
--- a/tp/t/results/info_tests/encoding_us_ascii.pl
+++ b/tp/t/results/info_tests/encoding_us_ascii.pl
@@ -102,7 +102,8 @@ $result_trees{'encoding_us_ascii'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -138,7 +139,8 @@ $result_nodes{'encoding_us_ascii'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'encoding_us_ascii'} = {
@@ -146,7 +148,8 @@ $result_menus{'encoding_us_ascii'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'encoding_us_ascii'} = [];
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index 9b79707a04..3a3725b977 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -409,7 +409,8 @@ $result_trees{'error_in_footnote'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -508,7 +509,8 @@ $result_nodes{'error_in_footnote'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'error_in_footnote'} = {
@@ -516,7 +518,8 @@ $result_menus{'error_in_footnote'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'error_in_footnote'} = [
diff --git a/tp/t/results/info_tests/file_only_png.pl 
b/tp/t/results/info_tests/file_only_png.pl
index 53d0c473ee..d8c8a03702 100644
Binary files a/tp/t/results/info_tests/file_only_png.pl and 
b/tp/t/results/info_tests/file_only_png.pl differ
diff --git a/tp/t/results/info_tests/float_long_captions.pl 
b/tp/t/results/info_tests/float_long_captions.pl
index 866fcf41f4..b4b675b734 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -348,7 +348,8 @@ $result_trees{'float_long_captions'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -431,7 +432,8 @@ $result_nodes{'float_long_captions'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'float_long_captions'} = {
@@ -439,7 +441,8 @@ $result_menus{'float_long_captions'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'float_long_captions'} = [];
diff --git a/tp/t/results/info_tests/image_and_punctuation.pl 
b/tp/t/results/info_tests/image_and_punctuation.pl
index fe233a0496..c5a371f235 100644
--- a/tp/t/results/info_tests/image_and_punctuation.pl
+++ b/tp/t/results/info_tests/image_and_punctuation.pl
@@ -330,7 +330,8 @@ $result_trees{'image_and_punctuation'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -423,7 +424,8 @@ $result_nodes{'image_and_punctuation'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'image_and_punctuation'} = {
@@ -431,7 +433,8 @@ $result_menus{'image_and_punctuation'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'image_and_punctuation'} = [];
diff --git a/tp/t/results/info_tests/image_and_spaces_formatting.pl 
b/tp/t/results/info_tests/image_and_spaces_formatting.pl
index 9a9d4ace99..0707259447 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -875,7 +875,8 @@ $result_trees{'image_and_spaces_formatting'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -1041,7 +1042,8 @@ $result_nodes{'image_and_spaces_formatting'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'image_and_spaces_formatting'} = {
@@ -1049,7 +1051,8 @@ $result_menus{'image_and_spaces_formatting'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'image_and_spaces_formatting'} = [];
diff --git a/tp/t/results/info_tests/image_extension.pl 
b/tp/t/results/info_tests/image_extension.pl
index f11a730027..cb020e7955 100644
--- a/tp/t/results/info_tests/image_extension.pl
+++ b/tp/t/results/info_tests/image_extension.pl
@@ -223,7 +223,8 @@ $result_trees{'image_extension'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -282,7 +283,8 @@ $result_nodes{'image_extension'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'image_extension'} = {
@@ -290,7 +292,8 @@ $result_menus{'image_extension'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'image_extension'} = [];
diff --git a/tp/t/results/info_tests/image_in_paragraph.pl 
b/tp/t/results/info_tests/image_in_paragraph.pl
index 1300470b54..d2696f4a48 100644
Binary files a/tp/t/results/info_tests/image_in_paragraph.pl and 
b/tp/t/results/info_tests/image_in_paragraph.pl differ
diff --git a/tp/t/results/info_tests/image_not_found.pl 
b/tp/t/results/info_tests/image_not_found.pl
index 2d8ae8807f..04765176cc 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -82,7 +82,8 @@ $result_trees{'image_not_found'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -111,7 +112,8 @@ $result_nodes{'image_not_found'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'image_not_found'} = {
@@ -119,7 +121,8 @@ $result_menus{'image_not_found'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'image_not_found'} = [];
diff --git a/tp/t/results/info_tests/image_quotes.pl 
b/tp/t/results/info_tests/image_quotes.pl
index 5fb4dae2de..c76a0c7221 100644
Binary files a/tp/t/results/info_tests/image_quotes.pl and 
b/tp/t/results/info_tests/image_quotes.pl differ
diff --git a/tp/t/results/info_tests/index_entry_at_end_node.pl 
b/tp/t/results/info_tests/index_entry_at_end_node.pl
index 772e9ea740..b3d1c9a179 100644
--- a/tp/t/results/info_tests/index_entry_at_end_node.pl
+++ b/tp/t/results/info_tests/index_entry_at_end_node.pl
@@ -51,7 +51,8 @@ $result_trees{'index_entry_at_end_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -310,7 +311,8 @@ $result_trees{'index_entry_at_end_node'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -451,7 +453,8 @@ $result_trees{'index_entry_at_end_node'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -651,7 +654,8 @@ $result_sectioning{'index_entry_at_end_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -666,7 +670,8 @@ $result_sectioning{'index_entry_at_end_node'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -687,7 +692,8 @@ $result_sectioning{'index_entry_at_end_node'} = {
                     'isindex' => 1,
                     'normalized' => 'indices',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -731,67 +737,73 @@ $result_nodes{'index_entry_at_end_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'appendix',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
             'level' => 1,
-            'number' => 'A'
+            'number' => 1
           }
         },
-        'isindex' => 1,
-        'normalized' => 'indices',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'appendix',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 'A'
+              }
+            },
+            'isindex' => 1,
+            'normalized' => 'indices',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'index_entry_at_end_node'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'index_entry_at_end_node'}{'menu_child'};
-$result_nodes{'index_entry_at_end_node'}{'menu_child'}{'node_next'}{'node_up'} 
= $result_nodes{'index_entry_at_end_node'};
-$result_nodes{'index_entry_at_end_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'index_entry_at_end_node'};
-$result_nodes{'index_entry_at_end_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'index_entry_at_end_node'};
-$result_nodes{'index_entry_at_end_node'}{'node_next'} = 
$result_nodes{'index_entry_at_end_node'}{'menu_child'};
+$result_nodes{'index_entry_at_end_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'index_entry_at_end_node'}{'structure'}{'menu_child'};
+$result_nodes{'index_entry_at_end_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_entry_at_end_node'};
+$result_nodes{'index_entry_at_end_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'index_entry_at_end_node'};
+$result_nodes{'index_entry_at_end_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'index_entry_at_end_node'};
+$result_nodes{'index_entry_at_end_node'}{'structure'}{'node_next'} = 
$result_nodes{'index_entry_at_end_node'}{'structure'}{'menu_child'};
 
 $result_menus{'index_entry_at_end_node'} = {
   'cmdname' => 'node',
@@ -799,34 +811,40 @@ $result_menus{'index_entry_at_end_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'isindex' => 1,
-        'normalized' => 'indices',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 'indices',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'index_entry_at_end_node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'index_entry_at_end_node'}{'menu_child'};
-$result_menus{'index_entry_at_end_node'}{'menu_child'}{'menu_next'}{'menu_up'} 
= $result_menus{'index_entry_at_end_node'};
-$result_menus{'index_entry_at_end_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'index_entry_at_end_node'};
+$result_menus{'index_entry_at_end_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'index_entry_at_end_node'}{'structure'}{'menu_child'};
+$result_menus{'index_entry_at_end_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_entry_at_end_node'};
+$result_menus{'index_entry_at_end_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'index_entry_at_end_node'};
 
 $result_errors{'index_entry_at_end_node'} = [];
 
diff --git a/tp/t/results/info_tests/invalid_node_name_no_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_no_warning.pl
index 67d7f6602d..092608d7cc 100644
--- a/tp/t/results/info_tests/invalid_node_name_no_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_no_warning.pl
@@ -400,7 +400,8 @@ $result_trees{'invalid_node_name_no_warning'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -466,7 +467,8 @@ $result_trees{'invalid_node_name_no_warning'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -539,7 +541,8 @@ $result_trees{'invalid_node_name_no_warning'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -821,7 +824,8 @@ $result_trees{'invalid_node_name_no_warning'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -994,33 +998,6 @@ $result_nodes{'invalid_node_name_no_warning'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'nodename_002e-a',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'node_002ccomma',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'bidule_003a',
-          'spaces_before_argument' => ' '
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1036,15 +1013,50 @@ $result_nodes{'invalid_node_name_no_warning'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'nodename_002e-a',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node_002ccomma',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'bidule_003a',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_next'};
-$result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'invalid_node_name_no_warning'};
-$result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'invalid_node_name_no_warning'}{'menu_child'};
-$result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'invalid_node_name_no_warning'};
-$result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_prev'} = 
$result_nodes{'invalid_node_name_no_warning'};
-$result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_up'} = 
$result_nodes{'invalid_node_name_no_warning'};
-$result_nodes{'invalid_node_name_no_warning'}{'node_next'} = 
$result_nodes{'invalid_node_name_no_warning'}{'menu_child'};
+$result_nodes{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'invalid_node_name_no_warning'};
+$result_nodes{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'invalid_node_name_no_warning'}{'structure'}{'menu_child'};
+$result_nodes{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'invalid_node_name_no_warning'};
+$result_nodes{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'invalid_node_name_no_warning'};
+$result_nodes{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'invalid_node_name_no_warning'};
+$result_nodes{'invalid_node_name_no_warning'}{'structure'}{'node_next'} = 
$result_nodes{'invalid_node_name_no_warning'}{'structure'}{'menu_child'};
 
 $result_menus{'invalid_node_name_no_warning'} = {
   'cmdname' => 'node',
@@ -1052,47 +1064,55 @@ $result_menus{'invalid_node_name_no_warning'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'nodename_002e-a',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node_002ccomma',
+        'normalized' => 'nodename_002e-a',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'bidule_003a',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node_002ccomma',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'bidule_003a',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'invalid_node_name_no_warning'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'invalid_node_name_no_warning'}{'menu_child'}{'menu_next'};
-$result_menus{'invalid_node_name_no_warning'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'invalid_node_name_no_warning'};
-$result_menus{'invalid_node_name_no_warning'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'invalid_node_name_no_warning'}{'menu_child'};
-$result_menus{'invalid_node_name_no_warning'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'invalid_node_name_no_warning'};
-$result_menus{'invalid_node_name_no_warning'}{'menu_child'}{'menu_up'} = 
$result_menus{'invalid_node_name_no_warning'};
+$result_menus{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'invalid_node_name_no_warning'};
+$result_menus{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'invalid_node_name_no_warning'}{'structure'}{'menu_child'};
+$result_menus{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'invalid_node_name_no_warning'};
+$result_menus{'invalid_node_name_no_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'invalid_node_name_no_warning'};
 
 $result_errors{'invalid_node_name_no_warning'} = [];
 
diff --git a/tp/t/results/info_tests/invalid_node_name_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_warning.pl
index 3305ae7228..df98ecb8f6 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -400,7 +400,8 @@ $result_trees{'invalid_node_name_warning'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -466,7 +467,8 @@ $result_trees{'invalid_node_name_warning'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -539,7 +541,8 @@ $result_trees{'invalid_node_name_warning'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -821,7 +824,8 @@ $result_trees{'invalid_node_name_warning'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -994,33 +998,6 @@ $result_nodes{'invalid_node_name_warning'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'nodename_002e-a',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'node_002ccomma',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'bidule_003a',
-          'spaces_before_argument' => ' '
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1036,15 +1013,50 @@ $result_nodes{'invalid_node_name_warning'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'nodename_002e-a',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node_002ccomma',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'bidule_003a',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_next'};
-$result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'invalid_node_name_warning'};
-$result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'invalid_node_name_warning'}{'menu_child'};
-$result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'invalid_node_name_warning'};
-$result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_prev'} = 
$result_nodes{'invalid_node_name_warning'};
-$result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_up'} = 
$result_nodes{'invalid_node_name_warning'};
-$result_nodes{'invalid_node_name_warning'}{'node_next'} = 
$result_nodes{'invalid_node_name_warning'}{'menu_child'};
+$result_nodes{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'invalid_node_name_warning'};
+$result_nodes{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'invalid_node_name_warning'}{'structure'}{'menu_child'};
+$result_nodes{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'invalid_node_name_warning'};
+$result_nodes{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'invalid_node_name_warning'};
+$result_nodes{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'invalid_node_name_warning'};
+$result_nodes{'invalid_node_name_warning'}{'structure'}{'node_next'} = 
$result_nodes{'invalid_node_name_warning'}{'structure'}{'menu_child'};
 
 $result_menus{'invalid_node_name_warning'} = {
   'cmdname' => 'node',
@@ -1052,47 +1064,55 @@ $result_menus{'invalid_node_name_warning'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'nodename_002e-a',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node_002ccomma',
+        'normalized' => 'nodename_002e-a',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'bidule_003a',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node_002ccomma',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'bidule_003a',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'invalid_node_name_warning'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'invalid_node_name_warning'}{'menu_child'}{'menu_next'};
-$result_menus{'invalid_node_name_warning'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'invalid_node_name_warning'};
-$result_menus{'invalid_node_name_warning'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'invalid_node_name_warning'}{'menu_child'};
-$result_menus{'invalid_node_name_warning'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'invalid_node_name_warning'};
-$result_menus{'invalid_node_name_warning'}{'menu_child'}{'menu_up'} = 
$result_menus{'invalid_node_name_warning'};
+$result_menus{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'invalid_node_name_warning'};
+$result_menus{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'invalid_node_name_warning'}{'structure'}{'menu_child'};
+$result_menus{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'invalid_node_name_warning'};
+$result_menus{'invalid_node_name_warning'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'invalid_node_name_warning'};
 
 $result_errors{'invalid_node_name_warning'} = [];
 
diff --git a/tp/t/results/info_tests/known_encoding.pl 
b/tp/t/results/info_tests/known_encoding.pl
index 3f5eb5c2a7..117340bd22 100644
--- a/tp/t/results/info_tests/known_encoding.pl
+++ b/tp/t/results/info_tests/known_encoding.pl
@@ -102,7 +102,8 @@ $result_trees{'known_encoding'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -138,7 +139,8 @@ $result_nodes{'known_encoding'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'known_encoding'} = {
@@ -146,7 +148,8 @@ $result_menus{'known_encoding'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'known_encoding'} = [
diff --git a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl 
b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
index 74d755245c..f4343737f5 100644
--- a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
+++ b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
@@ -980,7 +980,8 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -1183,7 +1184,8 @@ $result_nodes{'multitable_anchor_and_index_entry'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'multitable_anchor_and_index_entry'} = {
@@ -1192,7 +1194,8 @@ $result_menus{'multitable_anchor_and_index_entry'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'multitable_anchor_and_index_entry'} = [];
diff --git a/tp/t/results/info_tests/nested_footnotes_separate.pl 
b/tp/t/results/info_tests/nested_footnotes_separate.pl
index 6606e89175..ff7197eff3 100644
--- a/tp/t/results/info_tests/nested_footnotes_separate.pl
+++ b/tp/t/results/info_tests/nested_footnotes_separate.pl
@@ -183,7 +183,8 @@ $result_trees{'nested_footnotes_separate'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -233,7 +234,8 @@ $result_nodes{'nested_footnotes_separate'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'nested_footnotes_separate'} = {
@@ -241,7 +243,8 @@ $result_menus{'nested_footnotes_separate'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'nested_footnotes_separate'} = [];
diff --git a/tp/t/results/info_tests/nested_multitable_anchor_index.pl 
b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index cd503fbfed..15b58d911f 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -715,7 +715,8 @@ $result_trees{'nested_multitable_anchor_index'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -854,7 +855,8 @@ $result_nodes{'nested_multitable_anchor_index'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'nested_multitable_anchor_index'} = {
@@ -863,7 +865,8 @@ $result_menus{'nested_multitable_anchor_index'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'nested_multitable_anchor_index'} = [];
diff --git a/tp/t/results/info_tests/no_top_node.pl 
b/tp/t/results/info_tests/no_top_node.pl
index a4993cf068..522b69bfe9 100644
--- a/tp/t/results/info_tests/no_top_node.pl
+++ b/tp/t/results/info_tests/no_top_node.pl
@@ -51,7 +51,8 @@ $result_trees{'no_top_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -74,7 +75,8 @@ $result_nodes{'no_top_node'} = {
   'extra' => {
     'normalized' => 'node-Top-not-Top-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'no_top_node'} = {
@@ -82,7 +84,8 @@ $result_menus{'no_top_node'} = {
   'extra' => {
     'normalized' => 'node-Top-not-Top-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'no_top_node'} = [];
diff --git a/tp/t/results/info_tests/note_in_strong.pl 
b/tp/t/results/info_tests/note_in_strong.pl
index 9a5f504ba4..d64a905c74 100644
--- a/tp/t/results/info_tests/note_in_strong.pl
+++ b/tp/t/results/info_tests/note_in_strong.pl
@@ -322,7 +322,8 @@ $result_trees{'note_in_strong'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -417,7 +418,8 @@ $result_nodes{'note_in_strong'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'note_in_strong'} = {
@@ -425,7 +427,8 @@ $result_menus{'note_in_strong'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'note_in_strong'} = [];
diff --git a/tp/t/results/info_tests/note_in_strong_end_of_line.pl 
b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
index 940e34930c..b8e689977c 100644
--- a/tp/t/results/info_tests/note_in_strong_end_of_line.pl
+++ b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
@@ -143,7 +143,8 @@ $result_trees{'note_in_strong_end_of_line'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -191,7 +192,8 @@ $result_nodes{'note_in_strong_end_of_line'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'note_in_strong_end_of_line'} = {
@@ -199,7 +201,8 @@ $result_menus{'note_in_strong_end_of_line'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'note_in_strong_end_of_line'} = [];
diff --git a/tp/t/results/info_tests/novalidate_empty_refs.pl 
b/tp/t/results/info_tests/novalidate_empty_refs.pl
index 0d10462935..a1ed56a65f 100644
--- a/tp/t/results/info_tests/novalidate_empty_refs.pl
+++ b/tp/t/results/info_tests/novalidate_empty_refs.pl
@@ -188,7 +188,8 @@ $result_trees{'novalidate_empty_refs'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -386,7 +387,8 @@ $result_nodes{'novalidate_empty_refs'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'novalidate_empty_refs'} = {
@@ -394,7 +396,8 @@ $result_menus{'novalidate_empty_refs'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'novalidate_empty_refs'} = [
diff --git a/tp/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index eaba71d369..2f10293e0e 100644
--- a/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -139,7 +139,8 @@ $result_trees{'paragraphindent_and_preamble'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -378,7 +379,8 @@ $result_sectioning{'paragraphindent_and_preamble'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -406,7 +408,8 @@ $result_nodes{'paragraphindent_and_preamble'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'paragraphindent_and_preamble'} = {
@@ -414,7 +417,8 @@ $result_menus{'paragraphindent_and_preamble'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'paragraphindent_and_preamble'} = [];
diff --git a/tp/t/results/info_tests/pxref_test.pl 
b/tp/t/results/info_tests/pxref_test.pl
index ec211efa7f..ff327355b9 100644
--- a/tp/t/results/info_tests/pxref_test.pl
+++ b/tp/t/results/info_tests/pxref_test.pl
@@ -304,7 +304,8 @@ $result_trees{'pxref_test'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -380,7 +381,8 @@ $result_nodes{'pxref_test'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'pxref_test'} = {
@@ -388,7 +390,8 @@ $result_menus{'pxref_test'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'pxref_test'} = [];
diff --git a/tp/t/results/info_tests/ref_tests.pl 
b/tp/t/results/info_tests/ref_tests.pl
index 537b5a854c..a56062db78 100644
--- a/tp/t/results/info_tests/ref_tests.pl
+++ b/tp/t/results/info_tests/ref_tests.pl
@@ -526,7 +526,8 @@ $result_trees{'ref_tests'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -655,7 +656,8 @@ $result_nodes{'ref_tests'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'ref_tests'} = {
@@ -663,7 +665,8 @@ $result_menus{'ref_tests'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'ref_tests'} = [];
diff --git a/tp/t/results/info_tests/space_at_menu_end.pl 
b/tp/t/results/info_tests/space_at_menu_end.pl
index b724ddaa0d..4f5c7f76fa 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -210,7 +210,8 @@ $result_trees{'space_at_menu_end'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -272,15 +273,6 @@ $result_nodes{'space_at_menu_end'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'out'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -296,9 +288,20 @@ $result_nodes{'space_at_menu_end'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'out'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'space_at_menu_end'}{'node_next'} = 
$result_nodes{'space_at_menu_end'}{'menu_child'};
+$result_nodes{'space_at_menu_end'}{'structure'}{'node_next'} = 
$result_nodes{'space_at_menu_end'}{'structure'}{'menu_child'};
 
 $result_menus{'space_at_menu_end'} = {
   'cmdname' => 'node',
@@ -306,13 +309,15 @@ $result_menus{'space_at_menu_end'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'out'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'out'
+          }
+        ]
+      }
     }
   }
 };
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index 84db15ef2b..4406edd254 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -51,7 +51,8 @@ $result_trees{'space_in_menu'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -264,7 +265,8 @@ $result_trees{'space_in_menu'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -404,7 +406,8 @@ $result_sectioning{'space_in_menu'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -419,7 +422,8 @@ $result_sectioning{'space_in_menu'} = {
                   'extra' => {
                     'normalized' => 'node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -458,25 +462,6 @@ $result_nodes{'space_in_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -492,11 +477,34 @@ $result_nodes{'space_in_menu'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'space_in_menu'}{'menu_child'}{'node_prev'} = 
$result_nodes{'space_in_menu'};
-$result_nodes{'space_in_menu'}{'menu_child'}{'node_up'} = 
$result_nodes{'space_in_menu'};
-$result_nodes{'space_in_menu'}{'node_next'} = 
$result_nodes{'space_in_menu'}{'menu_child'};
+$result_nodes{'space_in_menu'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'space_in_menu'};
+$result_nodes{'space_in_menu'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'space_in_menu'};
+$result_nodes{'space_in_menu'}{'structure'}{'node_next'} = 
$result_nodes{'space_in_menu'}{'structure'}{'menu_child'};
 
 $result_menus{'space_in_menu'} = {
   'cmdname' => 'node',
@@ -504,19 +512,23 @@ $result_menus{'space_in_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'space_in_menu'}{'menu_child'}{'menu_up'} = 
$result_menus{'space_in_menu'};
+$result_menus{'space_in_menu'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'space_in_menu'};
 
 $result_errors{'space_in_menu'} = [];
 
diff --git a/tp/t/results/info_tests/space_in_setfilename.pl 
b/tp/t/results/info_tests/space_in_setfilename.pl
index 929f8ba7ab..a82cf29d02 100644
--- a/tp/t/results/info_tests/space_in_setfilename.pl
+++ b/tp/t/results/info_tests/space_in_setfilename.pl
@@ -117,7 +117,8 @@ $result_trees{'space_in_setfilename'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -151,7 +152,8 @@ $result_nodes{'space_in_setfilename'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'space_in_setfilename'} = {
@@ -159,7 +161,8 @@ $result_menus{'space_in_setfilename'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'space_in_setfilename'} = [
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index ae51c5cadb..ab1bb79145 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -98,7 +98,8 @@ $result_trees{'split_no_copying'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -311,7 +312,8 @@ $result_trees{'split_no_copying'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -486,7 +488,8 @@ $result_sectioning{'split_no_copying'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -501,7 +504,8 @@ $result_sectioning{'split_no_copying'} = {
                   'extra' => {
                     'normalized' => 'Ch1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -540,25 +544,6 @@ $result_nodes{'split_no_copying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'Ch1',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -574,11 +559,34 @@ $result_nodes{'split_no_copying'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'Ch1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'split_no_copying'}{'menu_child'}{'node_prev'} = 
$result_nodes{'split_no_copying'};
-$result_nodes{'split_no_copying'}{'menu_child'}{'node_up'} = 
$result_nodes{'split_no_copying'};
-$result_nodes{'split_no_copying'}{'node_next'} = 
$result_nodes{'split_no_copying'}{'menu_child'};
+$result_nodes{'split_no_copying'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'split_no_copying'};
+$result_nodes{'split_no_copying'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'split_no_copying'};
+$result_nodes{'split_no_copying'}{'structure'}{'node_next'} = 
$result_nodes{'split_no_copying'}{'structure'}{'menu_child'};
 
 $result_menus{'split_no_copying'} = {
   'cmdname' => 'node',
@@ -586,19 +594,23 @@ $result_menus{'split_no_copying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Ch1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'Ch1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'split_no_copying'}{'menu_child'}{'menu_up'} = 
$result_menus{'split_no_copying'};
+$result_menus{'split_no_copying'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'split_no_copying'};
 
 $result_errors{'split_no_copying'} = [];
 
diff --git a/tp/t/results/info_tests/split_test_before_first_node.pl 
b/tp/t/results/info_tests/split_test_before_first_node.pl
index ba731746f3..25c8f02565 100644
--- a/tp/t/results/info_tests/split_test_before_first_node.pl
+++ b/tp/t/results/info_tests/split_test_before_first_node.pl
@@ -104,7 +104,8 @@ $result_trees{'split_test_before_first_node'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -317,7 +318,8 @@ $result_trees{'split_test_before_first_node'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -480,7 +482,8 @@ $result_sectioning{'split_test_before_first_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -495,7 +498,8 @@ $result_sectioning{'split_test_before_first_node'} = {
                   'extra' => {
                     'normalized' => 'chap1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -534,25 +538,6 @@ $result_nodes{'split_test_before_first_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chap1',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -568,11 +553,34 @@ $result_nodes{'split_test_before_first_node'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chap1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'split_test_before_first_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'split_test_before_first_node'};
-$result_nodes{'split_test_before_first_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'split_test_before_first_node'};
-$result_nodes{'split_test_before_first_node'}{'node_next'} = 
$result_nodes{'split_test_before_first_node'}{'menu_child'};
+$result_nodes{'split_test_before_first_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'split_test_before_first_node'};
+$result_nodes{'split_test_before_first_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'split_test_before_first_node'};
+$result_nodes{'split_test_before_first_node'}{'structure'}{'node_next'} = 
$result_nodes{'split_test_before_first_node'}{'structure'}{'menu_child'};
 
 $result_menus{'split_test_before_first_node'} = {
   'cmdname' => 'node',
@@ -580,19 +588,23 @@ $result_menus{'split_test_before_first_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chap1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chap1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'split_test_before_first_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'split_test_before_first_node'};
+$result_menus{'split_test_before_first_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'split_test_before_first_node'};
 
 $result_errors{'split_test_before_first_node'} = [];
 
diff --git 
a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl 
b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
index 54990f3d52..d5c5daae64 100644
--- a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
+++ b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
@@ -98,7 +98,8 @@ $result_trees{'split_test_before_first_node_no_empty_line'} = 
{
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -311,7 +312,8 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -471,7 +473,8 @@ 
$result_sectioning{'split_test_before_first_node_no_empty_line'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -486,7 +489,8 @@ 
$result_sectioning{'split_test_before_first_node_no_empty_line'} = {
                   'extra' => {
                     'normalized' => 'chap1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -525,25 +529,6 @@ 
$result_nodes{'split_test_before_first_node_no_empty_line'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chap1',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -559,11 +544,34 @@ 
$result_nodes{'split_test_before_first_node_no_empty_line'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chap1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'split_test_before_first_node_no_empty_line'}{'menu_child'}{'node_prev'}
 = $result_nodes{'split_test_before_first_node_no_empty_line'};
-$result_nodes{'split_test_before_first_node_no_empty_line'}{'menu_child'}{'node_up'}
 = $result_nodes{'split_test_before_first_node_no_empty_line'};
-$result_nodes{'split_test_before_first_node_no_empty_line'}{'node_next'} = 
$result_nodes{'split_test_before_first_node_no_empty_line'}{'menu_child'};
+$result_nodes{'split_test_before_first_node_no_empty_line'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'split_test_before_first_node_no_empty_line'};
+$result_nodes{'split_test_before_first_node_no_empty_line'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'split_test_before_first_node_no_empty_line'};
+$result_nodes{'split_test_before_first_node_no_empty_line'}{'structure'}{'node_next'}
 = 
$result_nodes{'split_test_before_first_node_no_empty_line'}{'structure'}{'menu_child'};
 
 $result_menus{'split_test_before_first_node_no_empty_line'} = {
   'cmdname' => 'node',
@@ -571,19 +579,23 @@ 
$result_menus{'split_test_before_first_node_no_empty_line'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chap1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chap1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'split_test_before_first_node_no_empty_line'}{'menu_child'}{'menu_up'}
 = $result_menus{'split_test_before_first_node_no_empty_line'};
+$result_menus{'split_test_before_first_node_no_empty_line'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'split_test_before_first_node_no_empty_line'};
 
 $result_errors{'split_test_before_first_node_no_empty_line'} = [];
 
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index ae43a1ad89..d985cd379a 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -51,7 +51,8 @@ $result_trees{'test_index'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -215,7 +216,8 @@ $result_trees{'test_index'} = {
                                 'line_nr' => 205,
                                 'macro' => ''
                               },
-                              'parent' => {}
+                              'parent' => {},
+                              'structure' => {}
                             },
                             'number' => 7
                           },
@@ -1254,7 +1256,8 @@ $result_trees{'test_index'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4356,7 +4359,8 @@ $result_sectioning{'test_index'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -4371,7 +4375,8 @@ $result_sectioning{'test_index'} = {
                   'extra' => {
                     'normalized' => 'name',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -4392,7 +4397,8 @@ $result_sectioning{'test_index'} = {
                     'isindex' => 1,
                     'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -4513,67 +4519,73 @@ $result_nodes{'test_index'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'name',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'appendix',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
             'level' => 1,
-            'number' => 'A'
+            'number' => 1
           }
         },
-        'isindex' => 1,
-        'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
+        'normalized' => 'name',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'appendix',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 'A'
+              }
+            },
+            'isindex' => 1,
+            'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'test_index'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'test_index'}{'menu_child'};
-$result_nodes{'test_index'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'test_index'};
-$result_nodes{'test_index'}{'menu_child'}{'node_prev'} = 
$result_nodes{'test_index'};
-$result_nodes{'test_index'}{'menu_child'}{'node_up'} = 
$result_nodes{'test_index'};
-$result_nodes{'test_index'}{'node_next'} = 
$result_nodes{'test_index'}{'menu_child'};
+$result_nodes{'test_index'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'test_index'}{'structure'}{'menu_child'};
+$result_nodes{'test_index'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'test_index'};
+$result_nodes{'test_index'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'test_index'};
+$result_nodes{'test_index'}{'structure'}{'menu_child'}{'structure'}{'node_up'} 
= $result_nodes{'test_index'};
+$result_nodes{'test_index'}{'structure'}{'node_next'} = 
$result_nodes{'test_index'}{'structure'}{'menu_child'};
 
 $result_menus{'test_index'} = {
   'cmdname' => 'node',
@@ -4581,34 +4593,40 @@ $result_menus{'test_index'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'name',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'isindex' => 1,
-        'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
+        'normalized' => 'name',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'test_index'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'test_index'}{'menu_child'};
-$result_menus{'test_index'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'test_index'};
-$result_menus{'test_index'}{'menu_child'}{'menu_up'} = 
$result_menus{'test_index'};
+$result_menus{'test_index'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'test_index'}{'structure'}{'menu_child'};
+$result_menus{'test_index'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'test_index'};
+$result_menus{'test_index'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} 
= $result_menus{'test_index'};
 
 $result_errors{'test_index'} = [
   {
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index e6cac8c7ec..36779d1dc2 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -51,7 +51,8 @@ $result_trees{'text_before_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -258,7 +259,8 @@ $result_trees{'text_before_node'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -365,7 +367,8 @@ $result_sectioning{'text_before_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -380,7 +383,8 @@ $result_sectioning{'text_before_node'} = {
                   'extra' => {
                     'normalized' => 'chapter-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -419,25 +423,6 @@ $result_nodes{'text_before_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -453,11 +438,34 @@ $result_nodes{'text_before_node'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'text_before_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'text_before_node'};
-$result_nodes{'text_before_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'text_before_node'};
-$result_nodes{'text_before_node'}{'node_next'} = 
$result_nodes{'text_before_node'}{'menu_child'};
+$result_nodes{'text_before_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'text_before_node'};
+$result_nodes{'text_before_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'text_before_node'};
+$result_nodes{'text_before_node'}{'structure'}{'node_next'} = 
$result_nodes{'text_before_node'}{'structure'}{'menu_child'};
 
 $result_menus{'text_before_node'} = {
   'cmdname' => 'node',
@@ -465,19 +473,23 @@ $result_menus{'text_before_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'text_before_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'text_before_node'};
+$result_menus{'text_before_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'text_before_node'};
 
 $result_errors{'text_before_node'} = [];
 
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index 30aff0dbdf..e4acd49d92 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -251,7 +251,8 @@ $result_trees{'top_node_normalization'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -317,7 +318,6 @@ $result_nodes{'top_node_normalization'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {},
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -333,12 +333,15 @@ $result_nodes{'top_node_normalization'} = {
       }
     }
   ],
-  'node_next' => {},
-  'node_prev' => {}
+  'structure' => {
+    'menu_child' => {},
+    'node_next' => {},
+    'node_prev' => {}
+  }
 };
-$result_nodes{'top_node_normalization'}{'menu_child'} = 
$result_nodes{'top_node_normalization'};
-$result_nodes{'top_node_normalization'}{'node_next'} = 
$result_nodes{'top_node_normalization'};
-$result_nodes{'top_node_normalization'}{'node_prev'} = 
$result_nodes{'top_node_normalization'};
+$result_nodes{'top_node_normalization'}{'structure'}{'menu_child'} = 
$result_nodes{'top_node_normalization'};
+$result_nodes{'top_node_normalization'}{'structure'}{'node_next'} = 
$result_nodes{'top_node_normalization'};
+$result_nodes{'top_node_normalization'}{'structure'}{'node_prev'} = 
$result_nodes{'top_node_normalization'};
 
 $result_menus{'top_node_normalization'} = {
   'cmdname' => 'node',
@@ -346,14 +349,16 @@ $result_menus{'top_node_normalization'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {},
-  'menu_up' => {},
-  'menu_up_hash' => {
-    'Top' => 1
+  'structure' => {
+    'menu_child' => {},
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
-$result_menus{'top_node_normalization'}{'menu_child'} = 
$result_menus{'top_node_normalization'};
-$result_menus{'top_node_normalization'}{'menu_up'} = 
$result_menus{'top_node_normalization'};
+$result_menus{'top_node_normalization'}{'structure'}{'menu_child'} = 
$result_menus{'top_node_normalization'};
+$result_menus{'top_node_normalization'}{'structure'}{'menu_up'} = 
$result_menus{'top_node_normalization'};
 
 $result_errors{'top_node_normalization'} = [
   {
diff --git a/tp/t/results/info_tests/unknown_encoding.pl 
b/tp/t/results/info_tests/unknown_encoding.pl
index a7e6f0f235..9f52dc5de1 100644
--- a/tp/t/results/info_tests/unknown_encoding.pl
+++ b/tp/t/results/info_tests/unknown_encoding.pl
@@ -100,7 +100,8 @@ $result_trees{'unknown_encoding'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -136,7 +137,8 @@ $result_nodes{'unknown_encoding'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'unknown_encoding'} = {
@@ -144,7 +146,8 @@ $result_menus{'unknown_encoding'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'unknown_encoding'} = [
diff --git a/tp/t/results/info_tests/xref_test.pl 
b/tp/t/results/info_tests/xref_test.pl
index 70ab5ad37a..1c730e831c 100644
--- a/tp/t/results/info_tests/xref_test.pl
+++ b/tp/t/results/info_tests/xref_test.pl
@@ -346,7 +346,8 @@ $result_trees{'xref_test'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -433,7 +434,8 @@ $result_nodes{'xref_test'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'xref_test'} = {
@@ -441,7 +443,8 @@ $result_menus{'xref_test'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'xref_test'} = [];
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl 
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index 3bd187de70..77f29f8531 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -148,7 +148,8 @@ $result_trees{'footnote_in_ref'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -190,7 +191,8 @@ $result_nodes{'footnote_in_ref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'footnote_in_ref'} = {
@@ -198,7 +200,8 @@ $result_menus{'footnote_in_ref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'footnote_in_ref'} = [
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl 
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index a9c52695e4..3a159fed9b 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -147,7 +147,8 @@ $result_trees{'ignore_in_xref'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -193,7 +194,8 @@ $result_nodes{'ignore_in_xref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'ignore_in_xref'} = {
@@ -201,7 +203,8 @@ $result_menus{'ignore_in_xref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'ignore_in_xref'} = [
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index 5328b39fad..936613b914 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -1052,7 +1052,8 @@ $result_trees{'in_table'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -1262,7 +1263,8 @@ $result_nodes{'in_table'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'in_table'} = {
@@ -1271,7 +1273,8 @@ $result_menus{'in_table'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'in_table'} = [
diff --git a/tp/t/results/invalid_nestings/menu_in_style_command.pl 
b/tp/t/results/invalid_nestings/menu_in_style_command.pl
index 683d08c60d..a693297158 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -204,7 +204,8 @@ $result_trees{'menu_in_style_command'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -260,15 +261,6 @@ $result_nodes{'menu_in_style_command'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'truc'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -284,9 +276,20 @@ $result_nodes{'menu_in_style_command'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'truc'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'menu_in_style_command'}{'node_next'} = 
$result_nodes{'menu_in_style_command'}{'menu_child'};
+$result_nodes{'menu_in_style_command'}{'structure'}{'node_next'} = 
$result_nodes{'menu_in_style_command'}{'structure'}{'menu_child'};
 
 $result_menus{'menu_in_style_command'} = {
   'cmdname' => 'node',
@@ -294,13 +297,15 @@ $result_menus{'menu_in_style_command'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'truc'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'truc'
+          }
+        ]
+      }
     }
   }
 };
diff --git a/tp/t/results/invalid_nestings/node_in_copying.pl 
b/tp/t/results/invalid_nestings/node_in_copying.pl
index 10ee55c6f8..7bf49af1fe 100644
--- a/tp/t/results/invalid_nestings/node_in_copying.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying.pl
@@ -79,7 +79,8 @@ $result_trees{'node_in_copying'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -109,7 +110,8 @@ $result_nodes{'node_in_copying'} = {
   'extra' => {
     'normalized' => 'node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'node_in_copying'} = {
@@ -117,7 +119,8 @@ $result_menus{'node_in_copying'} = {
   'extra' => {
     'normalized' => 'node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_in_copying'} = [
diff --git a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl 
b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
index cfc8bc167b..9475a44cb6 100644
--- a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
@@ -101,7 +101,8 @@ $result_trees{'node_in_copying_not_closed'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -212,7 +213,8 @@ $result_sectioning{'node_in_copying_not_closed'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -240,7 +242,8 @@ $result_nodes{'node_in_copying_not_closed'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'node_in_copying_not_closed'} = {
@@ -248,7 +251,8 @@ $result_menus{'node_in_copying_not_closed'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_in_copying_not_closed'} = [
diff --git a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
index bfaf82b7a8..b136fddd28 100644
--- a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
@@ -200,7 +200,8 @@ $result_trees{'node_on_index_entry_line'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -258,34 +259,36 @@ $result_nodes{'node_on_index_entry_line'} = {
     'normalized' => 'a',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'm'
-        }
-      ],
-      'normalized' => 'b'
-    }
-  },
-  'node_prev' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'm'
-        }
-      ],
-      'normalized' => 'c'
-    }
-  },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'h'
-        }
-      ],
-      'normalized' => 'd'
+  'structure' => {
+    'node_next' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'm'
+          }
+        ],
+        'normalized' => 'b'
+      }
+    },
+    'node_prev' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'm'
+          }
+        ],
+        'normalized' => 'c'
+      }
+    },
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'h'
+          }
+        ],
+        'normalized' => 'd'
+      }
     }
   }
 };
@@ -295,7 +298,8 @@ $result_menus{'node_on_index_entry_line'} = {
   'extra' => {
     'normalized' => 'a',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_on_index_entry_line'} = [
diff --git a/tp/t/results/invalid_nestings/on_node_line.pl 
b/tp/t/results/invalid_nestings/on_node_line.pl
index 670e1d39fe..a01b9181a2 100644
--- a/tp/t/results/invalid_nestings/on_node_line.pl
+++ b/tp/t/results/invalid_nestings/on_node_line.pl
@@ -276,7 +276,8 @@ $result_trees{'on_node_line'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -338,23 +339,25 @@ $result_nodes{'on_node_line'} = {
     'normalized' => 'a',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'cmdname' => 'pxref',
-          'extra' => {
-            'node_argument' => {
-              'manual_content' => [
-                {
-                  'text' => 'somemanual'
-                }
-              ]
+  'structure' => {
+    'node_next' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'cmdname' => 'pxref',
+            'extra' => {
+              'node_argument' => {
+                'manual_content' => [
+                  {
+                    'text' => 'somemanual'
+                  }
+                ]
+              }
             }
           }
-        }
-      ],
-      'normalized' => '-'
+        ],
+        'normalized' => '-'
+      }
     }
   }
 };
@@ -364,7 +367,8 @@ $result_menus{'on_node_line'} = {
   'extra' => {
     'normalized' => 'a',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'on_node_line'} = [
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl 
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index 2f9cef11e0..a8eb5348a1 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -170,7 +170,8 @@ $result_trees{'quotation_in_ref'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -219,7 +220,8 @@ $result_nodes{'quotation_in_ref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'quotation_in_ref'} = {
@@ -227,7 +229,8 @@ $result_menus{'quotation_in_ref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'quotation_in_ref'} = [
diff --git a/tp/t/results/invalid_nestings/ref_in_anchor.pl 
b/tp/t/results/invalid_nestings/ref_in_anchor.pl
index 18b7f24eed..514517c06e 100644
--- a/tp/t/results/invalid_nestings/ref_in_anchor.pl
+++ b/tp/t/results/invalid_nestings/ref_in_anchor.pl
@@ -117,7 +117,8 @@ $result_trees{'ref_in_anchor'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -151,7 +152,8 @@ $result_nodes{'ref_in_anchor'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'ref_in_anchor'} = {
@@ -159,7 +161,8 @@ $result_menus{'ref_in_anchor'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'ref_in_anchor'} = [
diff --git a/tp/t/results/invalid_nestings/ref_in_ref.pl 
b/tp/t/results/invalid_nestings/ref_in_ref.pl
index d2c47cb624..05c34b5d0e 100644
--- a/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -116,7 +116,8 @@ $result_trees{'ref_in_ref'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -149,7 +150,8 @@ $result_nodes{'ref_in_ref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'ref_in_ref'} = {
@@ -157,7 +159,8 @@ $result_menus{'ref_in_ref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'ref_in_ref'} = [
diff --git 
a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl 
b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
index 2de3b9b989..9744d52b8d 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
@@ -99,7 +99,8 @@ $result_trees{'style_not_closed_before_first_node'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -135,7 +136,8 @@ $result_nodes{'style_not_closed_before_first_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'style_not_closed_before_first_node'} = {
@@ -143,7 +145,8 @@ $result_menus{'style_not_closed_before_first_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'style_not_closed_before_first_node'} = [
diff --git 
a/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
index 5274b80e20..46e7f5e839 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
@@ -51,7 +51,8 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -276,7 +277,8 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -450,7 +452,8 @@ 
$result_sectioning{'style_not_closed_no_newline_root_commands'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -465,7 +468,8 @@ 
$result_sectioning{'style_not_closed_no_newline_root_commands'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -504,25 +508,6 @@ $result_nodes{'style_not_closed_no_newline_root_commands'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -538,11 +523,34 @@ 
$result_nodes{'style_not_closed_no_newline_root_commands'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'style_not_closed_no_newline_root_commands'}{'menu_child'}{'node_prev'}
 = $result_nodes{'style_not_closed_no_newline_root_commands'};
-$result_nodes{'style_not_closed_no_newline_root_commands'}{'menu_child'}{'node_up'}
 = $result_nodes{'style_not_closed_no_newline_root_commands'};
-$result_nodes{'style_not_closed_no_newline_root_commands'}{'node_next'} = 
$result_nodes{'style_not_closed_no_newline_root_commands'}{'menu_child'};
+$result_nodes{'style_not_closed_no_newline_root_commands'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'style_not_closed_no_newline_root_commands'};
+$result_nodes{'style_not_closed_no_newline_root_commands'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'style_not_closed_no_newline_root_commands'};
+$result_nodes{'style_not_closed_no_newline_root_commands'}{'structure'}{'node_next'}
 = 
$result_nodes{'style_not_closed_no_newline_root_commands'}{'structure'}{'menu_child'};
 
 $result_menus{'style_not_closed_no_newline_root_commands'} = {
   'cmdname' => 'node',
@@ -550,19 +558,23 @@ 
$result_menus{'style_not_closed_no_newline_root_commands'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'style_not_closed_no_newline_root_commands'}{'menu_child'}{'menu_up'}
 = $result_menus{'style_not_closed_no_newline_root_commands'};
+$result_menus{'style_not_closed_no_newline_root_commands'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'style_not_closed_no_newline_root_commands'};
 
 $result_errors{'style_not_closed_no_newline_root_commands'} = [
   {
diff --git a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
index 106c8ea3a0..2e272ca208 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
@@ -51,7 +51,8 @@ $result_trees{'style_not_closed_root_commands'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -282,7 +283,8 @@ $result_trees{'style_not_closed_root_commands'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -468,7 +470,8 @@ $result_sectioning{'style_not_closed_root_commands'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -483,7 +486,8 @@ $result_sectioning{'style_not_closed_root_commands'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -522,25 +526,6 @@ $result_nodes{'style_not_closed_root_commands'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -556,11 +541,34 @@ $result_nodes{'style_not_closed_root_commands'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'style_not_closed_root_commands'}{'menu_child'}{'node_prev'} = 
$result_nodes{'style_not_closed_root_commands'};
-$result_nodes{'style_not_closed_root_commands'}{'menu_child'}{'node_up'} = 
$result_nodes{'style_not_closed_root_commands'};
-$result_nodes{'style_not_closed_root_commands'}{'node_next'} = 
$result_nodes{'style_not_closed_root_commands'}{'menu_child'};
+$result_nodes{'style_not_closed_root_commands'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'style_not_closed_root_commands'};
+$result_nodes{'style_not_closed_root_commands'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'style_not_closed_root_commands'};
+$result_nodes{'style_not_closed_root_commands'}{'structure'}{'node_next'} = 
$result_nodes{'style_not_closed_root_commands'}{'structure'}{'menu_child'};
 
 $result_menus{'style_not_closed_root_commands'} = {
   'cmdname' => 'node',
@@ -568,19 +576,23 @@ $result_menus{'style_not_closed_root_commands'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'style_not_closed_root_commands'}{'menu_child'}{'menu_up'} = 
$result_menus{'style_not_closed_root_commands'};
+$result_menus{'style_not_closed_root_commands'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'style_not_closed_root_commands'};
 
 $result_errors{'style_not_closed_root_commands'} = [
   {
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 36dc2adf19..603f8acdbc 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -143,7 +143,8 @@ $result_trees{'verbatim_in_ref'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -188,7 +189,8 @@ $result_nodes{'verbatim_in_ref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'verbatim_in_ref'} = {
@@ -196,7 +198,8 @@ $result_menus{'verbatim_in_ref'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'verbatim_in_ref'} = [
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl 
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index e7e7e57408..54d977ccc5 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -87,7 +87,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -167,7 +168,8 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1373,7 +1375,8 @@ $result_sectioning{'inter_item_commands_in_enumerate'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1388,7 +1391,8 @@ $result_sectioning{'inter_item_commands_in_enumerate'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1427,35 +1431,40 @@ $result_nodes{'inter_item_commands_in_enumerate'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'inter_item_commands_in_enumerate'}{'node_next'}{'node_prev'} = 
$result_nodes{'inter_item_commands_in_enumerate'};
-$result_nodes{'inter_item_commands_in_enumerate'}{'node_next'}{'node_up'} = 
$result_nodes{'inter_item_commands_in_enumerate'};
+$result_nodes{'inter_item_commands_in_enumerate'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'inter_item_commands_in_enumerate'};
+$result_nodes{'inter_item_commands_in_enumerate'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'inter_item_commands_in_enumerate'};
 
 $result_menus{'inter_item_commands_in_enumerate'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'inter_item_commands_in_enumerate'} = [];
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index d46a94386a..95b04e2adf 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -87,7 +87,8 @@ $result_trees{'inter_item_commands_in_itemize'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -167,7 +168,8 @@ $result_trees{'inter_item_commands_in_itemize'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -925,7 +927,8 @@ $result_sectioning{'inter_item_commands_in_itemize'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -940,7 +943,8 @@ $result_sectioning{'inter_item_commands_in_itemize'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -979,35 +983,40 @@ $result_nodes{'inter_item_commands_in_itemize'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'inter_item_commands_in_itemize'}{'node_next'}{'node_prev'} = 
$result_nodes{'inter_item_commands_in_itemize'};
-$result_nodes{'inter_item_commands_in_itemize'}{'node_next'}{'node_up'} = 
$result_nodes{'inter_item_commands_in_itemize'};
+$result_nodes{'inter_item_commands_in_itemize'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'inter_item_commands_in_itemize'};
+$result_nodes{'inter_item_commands_in_itemize'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'inter_item_commands_in_itemize'};
 
 $result_menus{'inter_item_commands_in_itemize'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'inter_item_commands_in_itemize'} = [];
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index 9b19d3d02b..d4c69c22e1 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -87,7 +87,8 @@ $result_trees{'appendix_translated'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -241,7 +242,8 @@ $result_sectioning{'appendix_translated'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -287,7 +289,8 @@ $result_nodes{'appendix_translated'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'appendix_translated'} = {
@@ -295,7 +298,8 @@ $result_menus{'appendix_translated'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'appendix_translated'} = [];
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index 555e2438a5..39ce58fd6b 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -87,7 +87,8 @@ $result_trees{'command_translated'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -225,7 +226,8 @@ $result_sectioning{'command_translated'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -253,7 +255,8 @@ $result_nodes{'command_translated'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'command_translated'} = {
@@ -261,7 +264,8 @@ $result_menus{'command_translated'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'command_translated'} = [];
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index a6f9a60c22..c3ae5f9b45 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -808,7 +808,8 @@ $result_trees{'multiple'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -967,7 +968,8 @@ $result_nodes{'multiple'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'multiple'} = {
@@ -976,7 +978,8 @@ $result_menus{'multiple'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'multiple'} = [];
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index 47da347173..39d936baf8 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -171,7 +171,8 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -624,7 +625,8 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -951,7 +953,8 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 32,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1278,7 +1281,8 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 40,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1559,7 +1563,8 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 47,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1669,7 +1674,8 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 51,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2099,7 +2105,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -2114,7 +2121,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-ja',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2134,7 +2142,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-en',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2155,7 +2164,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-fr_005fFR',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2176,7 +2186,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-de',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2197,7 +2208,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-pt_005fBR',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2253,23 +2265,23 @@ $result_nodes{'multiple_lang_chapters'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter-ja',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -2279,28 +2291,13 @@ $result_nodes{'multiple_lang_chapters'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'chapter-en',
+        'normalized' => 'chapter-ja',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
-          },
-          'normalized' => 'chapter-fr_005fFR',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
@@ -2311,71 +2308,98 @@ $result_nodes{'multiple_lang_chapters'} = {
               },
               'structure' => {
                 'level' => 1,
-                'number' => 4
+                'number' => 2
               }
             },
-            'normalized' => 'chapter-de',
+            'normalized' => 'chapter-en',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 3
+                  }
                 },
-                'structure' => {
-                  'level' => 1,
-                  'number' => 5
-                }
+                'normalized' => 'chapter-fr_005fFR',
+                'spaces_before_argument' => ' '
               },
-              'normalized' => 'chapter-pt_005fBR',
-              'spaces_before_argument' => ' '
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'chapter',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 1,
+                        'number' => 4
+                      }
+                    },
+                    'normalized' => 'chapter-de',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'chapter',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 1,
+                            'number' => 5
+                          }
+                        },
+                        'normalized' => 'chapter-pt_005fBR',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
             },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters'};
-$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters'};
-$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'};
-$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters'};
-$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters'}{'menu_child'};
-$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_up'} 
= $result_nodes{'multiple_lang_chapters'};
-$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_prev'} = 
$result_nodes{'multiple_lang_chapters'};
-$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_up'} = 
$result_nodes{'multiple_lang_chapters'};
-$result_nodes{'multiple_lang_chapters'}{'node_next'} = 
$result_nodes{'multiple_lang_chapters'}{'menu_child'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters'};
+$result_nodes{'multiple_lang_chapters'}{'structure'}{'node_next'} = 
$result_nodes{'multiple_lang_chapters'}{'structure'}{'menu_child'};
 
 $result_menus{'multiple_lang_chapters'} = {
   'cmdname' => 'node',
@@ -2383,75 +2407,87 @@ $result_menus{'multiple_lang_chapters'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-ja',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter-en',
+        'normalized' => 'chapter-ja',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'chapter-fr_005fFR',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'chapter-de',
+            'normalized' => 'chapter-en',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'chapter-pt_005fBR',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'chapter-fr_005fFR',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'chapter-de',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'chapter-pt_005fBR',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
             },
             'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters'};
-$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters'};
-$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'};
-$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters'};
-$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'multiple_lang_chapters'}{'menu_child'};
-$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_next'}{'menu_up'} 
= $result_menus{'multiple_lang_chapters'};
-$result_menus{'multiple_lang_chapters'}{'menu_child'}{'menu_up'} = 
$result_menus{'multiple_lang_chapters'};
+$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters'};
+$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters'};
+$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters'};
+$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'};
+$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters'};
+$result_menus{'multiple_lang_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters'};
 
 $result_errors{'multiple_lang_chapters'} = [];
 
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 730a7f78b2..0f1e9bfbad 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -171,7 +171,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -624,7 +625,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -951,7 +953,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 32,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1278,7 +1281,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 40,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1559,7 +1563,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 47,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1669,7 +1674,8 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 51,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2099,7 +2105,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -2114,7 +2121,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'normalized' => 'chapter-ja',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2134,7 +2142,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'normalized' => 'chapter-en',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2155,7 +2164,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'normalized' => 'chapter-fr_005fFR',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2176,7 +2186,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'normalized' => 'chapter-de',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2197,7 +2208,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'normalized' => 'chapter-pt_005fBR',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2253,23 +2265,23 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter-ja',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -2279,28 +2291,13 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'chapter-en',
+        'normalized' => 'chapter-ja',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
-          },
-          'normalized' => 'chapter-fr_005fFR',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
@@ -2311,71 +2308,98 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
               },
               'structure' => {
                 'level' => 1,
-                'number' => 4
+                'number' => 2
               }
             },
-            'normalized' => 'chapter-de',
+            'normalized' => 'chapter-en',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 3
+                  }
                 },
-                'structure' => {
-                  'level' => 1,
-                  'number' => 5
-                }
+                'normalized' => 'chapter-fr_005fFR',
+                'spaces_before_argument' => ' '
               },
-              'normalized' => 'chapter-pt_005fBR',
-              'spaces_before_argument' => ' '
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'chapter',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 1,
+                        'number' => 4
+                      }
+                    },
+                    'normalized' => 'chapter-de',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'chapter',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 1,
+                            'number' => 5
+                          }
+                        },
+                        'normalized' => 'chapter-pt_005fBR',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
             },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_latex'};
-$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_latex'};
-$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'};
-$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_latex'};
-$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters_latex'}{'menu_child'};
-$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_latex'};
-$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_prev'} = 
$result_nodes{'multiple_lang_chapters_latex'};
-$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'}{'node_up'} = 
$result_nodes{'multiple_lang_chapters_latex'};
-$result_nodes{'multiple_lang_chapters_latex'}{'node_next'} = 
$result_nodes{'multiple_lang_chapters_latex'}{'menu_child'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_latex'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_latex'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_latex'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_latex'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters_latex'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_latex'};
+$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'node_next'} = 
$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'};
 
 $result_menus{'multiple_lang_chapters_latex'} = {
   'cmdname' => 'node',
@@ -2383,75 +2407,87 @@ $result_menus{'multiple_lang_chapters_latex'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-ja',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter-en',
+        'normalized' => 'chapter-ja',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'chapter-fr_005fFR',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'chapter-de',
+            'normalized' => 'chapter-en',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'chapter-pt_005fBR',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'chapter-fr_005fFR',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'chapter-de',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'chapter-pt_005fBR',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
             },
             'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_latex'};
-$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_latex'};
-$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'};
-$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_latex'};
-$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'multiple_lang_chapters_latex'}{'menu_child'};
-$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_latex'};
-$result_menus{'multiple_lang_chapters_latex'}{'menu_child'}{'menu_up'} = 
$result_menus{'multiple_lang_chapters_latex'};
+$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_latex'};
+$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_latex'};
+$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_latex'};
+$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'};
+$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_latex'};
+$result_menus{'multiple_lang_chapters_latex'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_latex'};
 
 $result_errors{'multiple_lang_chapters_latex'} = [];
 
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 37ad586ddb..3dbfe9dc3b 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -142,7 +142,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -595,7 +596,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -922,7 +924,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 32,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1249,7 +1252,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 40,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1530,7 +1534,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 47,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1640,7 +1645,8 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 51,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2066,7 +2072,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -2081,7 +2088,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
                   'extra' => {
                     'normalized' => 'chapter-ja',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2101,7 +2109,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
                   'extra' => {
                     'normalized' => 'chapter-en',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2122,7 +2131,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
                   'extra' => {
                     'normalized' => 'chapter-fr_005fFR',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2143,7 +2153,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
                   'extra' => {
                     'normalized' => 'chapter-de',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2164,7 +2175,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
                   'extra' => {
                     'normalized' => 'chapter-pt_005fBR',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2220,23 +2232,23 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter-ja',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -2246,28 +2258,13 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'chapter-en',
+        'normalized' => 'chapter-ja',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
-          },
-          'normalized' => 'chapter-fr_005fFR',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
@@ -2278,71 +2275,98 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
               },
               'structure' => {
                 'level' => 1,
-                'number' => 4
+                'number' => 2
               }
             },
-            'normalized' => 'chapter-de',
+            'normalized' => 'chapter-en',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 3
+                  }
                 },
-                'structure' => {
-                  'level' => 1,
-                  'number' => 5
-                }
+                'normalized' => 'chapter-fr_005fFR',
+                'spaces_before_argument' => ' '
               },
-              'normalized' => 'chapter-pt_005fBR',
-              'spaces_before_argument' => ' '
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'chapter',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 1,
+                        'number' => 4
+                      }
+                    },
+                    'normalized' => 'chapter-de',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'chapter',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 1,
+                            'number' => 5
+                          }
+                        },
+                        'normalized' => 'chapter-pt_005fBR',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
             },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_texi2html'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_texi2html'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_texi2html'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_texi2html'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_prev'} = 
$result_nodes{'multiple_lang_chapters_texi2html'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_up'} = 
$result_nodes{'multiple_lang_chapters_texi2html'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'node_next'} = 
$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_texi2html'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_texi2html'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_texi2html'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_texi2html'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'multiple_lang_chapters_texi2html'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'multiple_lang_chapters_texi2html'};
+$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'node_next'} = 
$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'};
 
 $result_menus{'multiple_lang_chapters_texi2html'} = {
   'cmdname' => 'node',
@@ -2350,75 +2374,87 @@ $result_menus{'multiple_lang_chapters_texi2html'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-ja',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter-en',
+        'normalized' => 'chapter-ja',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'chapter-fr_005fFR',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'chapter-de',
+            'normalized' => 'chapter-en',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'chapter-pt_005fBR',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'chapter-fr_005fFR',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'chapter-de',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'chapter-pt_005fBR',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
             },
             'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_texi2html'};
-$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_texi2html'};
-$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'};
-$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_texi2html'};
-$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'};
-$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_texi2html'};
-$result_menus{'multiple_lang_chapters_texi2html'}{'menu_child'}{'menu_up'} = 
$result_menus{'multiple_lang_chapters_texi2html'};
+$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_texi2html'};
+$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_texi2html'};
+$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_texi2html'};
+$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'};
+$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_texi2html'};
+$result_menus{'multiple_lang_chapters_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'multiple_lang_chapters_texi2html'};
 
 $result_errors{'multiple_lang_chapters_texi2html'} = [];
 
diff --git a/tp/t/results/languages/simple.pl b/tp/t/results/languages/simple.pl
index 5ebc8c7bcb..4c5267178d 100644
--- a/tp/t/results/languages/simple.pl
+++ b/tp/t/results/languages/simple.pl
@@ -259,7 +259,8 @@ $result_trees{'simple'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -318,7 +319,8 @@ $result_nodes{'simple'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'simple'} = {
@@ -326,7 +328,8 @@ $result_menus{'simple'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'simple'} = [];
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index 0a09a837e1..fc2d197e14 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -87,7 +87,8 @@ $result_trees{'unknown_language'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -335,7 +336,8 @@ $result_sectioning{'unknown_language'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -363,7 +365,8 @@ $result_nodes{'unknown_language'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'unknown_language'} = {
@@ -371,7 +374,8 @@ $result_menus{'unknown_language'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'unknown_language'} = [
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 0cc195bd31..5b5d5d97f3 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -259,7 +259,8 @@ $result_trees{'unknown_region'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -318,7 +319,8 @@ $result_nodes{'unknown_region'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'unknown_region'} = {
@@ -326,7 +328,8 @@ $result_menus{'unknown_region'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'unknown_region'} = [
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index 3288ca2f30..3abc5810a5 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -145,7 +145,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -186,7 +187,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -375,7 +377,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -416,7 +419,8 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1083,7 +1087,8 @@ 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1098,7 +1103,8 @@ 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                   'extra' => {
                     'normalized' => 'chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1137,35 +1143,40 @@ 
$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chap',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chap',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'}{'node_next'}{'node_prev'}
 = $result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'};
-$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'}{'node_next'}{'node_up'}
 = $result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'};
+$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'};
+$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'};
 
 $result_menus{'anchor_links_xref_xrefautomaticsectiontitle'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'anchor_links_xref_xrefautomaticsectiontitle'} = [
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index 44628df0f0..04fd558b6f 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -263,7 +263,8 @@ $result_trees{'custom_headings'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -343,7 +344,8 @@ $result_trees{'custom_headings'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -966,7 +968,8 @@ $result_sectioning{'custom_headings'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -981,7 +984,8 @@ $result_sectioning{'custom_headings'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1070,35 +1074,40 @@ $result_nodes{'custom_headings'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'custom_headings'}{'node_next'}{'node_prev'} = 
$result_nodes{'custom_headings'};
-$result_nodes{'custom_headings'}{'node_next'}{'node_up'} = 
$result_nodes{'custom_headings'};
+$result_nodes{'custom_headings'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'custom_headings'};
+$result_nodes{'custom_headings'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'custom_headings'};
 
 $result_menus{'custom_headings'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'custom_headings'} = [];
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index 8c421b309f..4db0bb9d8a 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -87,7 +87,8 @@ $result_trees{'float_and_refs'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -167,7 +168,8 @@ $result_trees{'float_and_refs'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2262,7 +2264,8 @@ $result_sectioning{'float_and_refs'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -2277,7 +2280,8 @@ $result_sectioning{'float_and_refs'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2352,35 +2356,40 @@ $result_nodes{'float_and_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'float_and_refs'}{'node_next'}{'node_prev'} = 
$result_nodes{'float_and_refs'};
-$result_nodes{'float_and_refs'}{'node_next'}{'node_up'} = 
$result_nodes{'float_and_refs'};
+$result_nodes{'float_and_refs'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'float_and_refs'};
+$result_nodes{'float_and_refs'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'float_and_refs'};
 
 $result_menus{'float_and_refs'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'float_and_refs'} = [];
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index 54333d2c16..f6a0b38c0e 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -124,7 +124,8 @@ $result_trees{'fonttextsize'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -204,7 +205,8 @@ $result_trees{'fonttextsize'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -736,7 +738,8 @@ $result_sectioning{'fonttextsize'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -751,7 +754,8 @@ $result_sectioning{'fonttextsize'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -860,35 +864,40 @@ $result_nodes{'fonttextsize'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'fonttextsize'}{'node_next'}{'node_prev'} = 
$result_nodes{'fonttextsize'};
-$result_nodes{'fonttextsize'}{'node_next'}{'node_up'} = 
$result_nodes{'fonttextsize'};
+$result_nodes{'fonttextsize'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'fonttextsize'};
+$result_nodes{'fonttextsize'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'fonttextsize'};
 
 $result_menus{'fonttextsize'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'fonttextsize'} = [
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 9c3389b51a..bd3d7b4326 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -117,7 +117,8 @@ $result_trees{'indices'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -198,7 +199,8 @@ $result_trees{'indices'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1238,7 +1240,8 @@ $result_sectioning{'indices'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1254,7 +1257,8 @@ $result_sectioning{'indices'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1293,36 +1297,41 @@ $result_nodes{'indices'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'isindex' => 1,
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'isindex' => 1,
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'indices'}{'node_next'}{'node_prev'} = $result_nodes{'indices'};
-$result_nodes{'indices'}{'node_next'}{'node_up'} = $result_nodes{'indices'};
+$result_nodes{'indices'}{'structure'}{'node_next'}{'structure'}{'node_prev'} = 
$result_nodes{'indices'};
+$result_nodes{'indices'}{'structure'}{'node_next'}{'structure'}{'node_up'} = 
$result_nodes{'indices'};
 
 $result_menus{'indices'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'indices'} = [
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index 3f36a37fa6..23baa07379 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -121,7 +121,8 @@ $result_trees{'pagesizes'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -201,7 +202,8 @@ $result_trees{'pagesizes'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -472,7 +474,8 @@ $result_sectioning{'pagesizes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -487,7 +490,8 @@ $result_sectioning{'pagesizes'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -544,35 +548,40 @@ $result_nodes{'pagesizes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'pagesizes'}{'node_next'}{'node_prev'} = 
$result_nodes{'pagesizes'};
-$result_nodes{'pagesizes'}{'node_next'}{'node_up'} = 
$result_nodes{'pagesizes'};
+$result_nodes{'pagesizes'}{'structure'}{'node_next'}{'structure'}{'node_prev'} 
= $result_nodes{'pagesizes'};
+$result_nodes{'pagesizes'}{'structure'}{'node_next'}{'structure'}{'node_up'} = 
$result_nodes{'pagesizes'};
 
 $result_menus{'pagesizes'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'pagesizes'} = [
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index ea2f4a87fa..c518f5a4ae 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -123,7 +123,8 @@ $result_trees{'pagetype'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -203,7 +204,8 @@ $result_trees{'pagetype'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -491,7 +493,8 @@ $result_sectioning{'pagetype'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -506,7 +509,8 @@ $result_sectioning{'pagetype'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -563,35 +567,40 @@ $result_nodes{'pagetype'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'pagetype'}{'node_next'}{'node_prev'} = 
$result_nodes{'pagetype'};
-$result_nodes{'pagetype'}{'node_next'}{'node_up'} = $result_nodes{'pagetype'};
+$result_nodes{'pagetype'}{'structure'}{'node_next'}{'structure'}{'node_prev'} 
= $result_nodes{'pagetype'};
+$result_nodes{'pagetype'}{'structure'}{'node_next'}{'structure'}{'node_up'} = 
$result_nodes{'pagetype'};
 
 $result_menus{'pagetype'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'pagetype'} = [
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index 497af12977..9682fde204 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -129,7 +129,8 @@ $result_trees{'shorttitlepage'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -209,7 +210,8 @@ $result_trees{'shorttitlepage'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -334,7 +336,8 @@ $result_sectioning{'shorttitlepage'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -349,7 +352,8 @@ $result_sectioning{'shorttitlepage'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -388,35 +392,40 @@ $result_nodes{'shorttitlepage'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'shorttitlepage'}{'node_next'}{'node_prev'} = 
$result_nodes{'shorttitlepage'};
-$result_nodes{'shorttitlepage'}{'node_next'}{'node_up'} = 
$result_nodes{'shorttitlepage'};
+$result_nodes{'shorttitlepage'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'shorttitlepage'};
+$result_nodes{'shorttitlepage'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'shorttitlepage'};
 
 $result_menus{'shorttitlepage'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'shorttitlepage'} = [];
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index d3bd6faf6a..c066721c18 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -441,7 +441,8 @@ $result_trees{'titlepage_classical'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -521,7 +522,8 @@ $result_trees{'titlepage_classical'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -712,7 +714,8 @@ $result_sectioning{'titlepage_classical'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -727,7 +730,8 @@ $result_sectioning{'titlepage_classical'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -766,35 +770,40 @@ $result_nodes{'titlepage_classical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'titlepage_classical'}{'node_next'}{'node_prev'} = 
$result_nodes{'titlepage_classical'};
-$result_nodes{'titlepage_classical'}{'node_next'}{'node_up'} = 
$result_nodes{'titlepage_classical'};
+$result_nodes{'titlepage_classical'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'titlepage_classical'};
+$result_nodes{'titlepage_classical'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'titlepage_classical'};
 
 $result_menus{'titlepage_classical'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'titlepage_classical'} = [];
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl 
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index eea07dead1..97c4d48e14 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -87,7 +87,8 @@ $result_trees{'titlepage_in_top_node'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -271,7 +272,8 @@ $result_trees{'titlepage_in_top_node'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -410,7 +412,8 @@ $result_sectioning{'titlepage_in_top_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -425,7 +428,8 @@ $result_sectioning{'titlepage_in_top_node'} = {
                   'extra' => {
                     'normalized' => 'chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -464,35 +468,40 @@ $result_nodes{'titlepage_in_top_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chap',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chap',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'titlepage_in_top_node'}{'node_next'}{'node_prev'} = 
$result_nodes{'titlepage_in_top_node'};
-$result_nodes{'titlepage_in_top_node'}{'node_next'}{'node_up'} = 
$result_nodes{'titlepage_in_top_node'};
+$result_nodes{'titlepage_in_top_node'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'titlepage_in_top_node'};
+$result_nodes{'titlepage_in_top_node'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'titlepage_in_top_node'};
 
 $result_menus{'titlepage_in_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'titlepage_in_top_node'} = [];
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 9839bd2e67..f8da52539b 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -182,7 +182,8 @@ $result_trees{'titlepage_long_title'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -262,7 +263,8 @@ $result_trees{'titlepage_long_title'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -395,7 +397,8 @@ $result_sectioning{'titlepage_long_title'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -410,7 +413,8 @@ $result_sectioning{'titlepage_long_title'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -449,35 +453,40 @@ $result_nodes{'titlepage_long_title'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'titlepage_long_title'}{'node_next'}{'node_prev'} = 
$result_nodes{'titlepage_long_title'};
-$result_nodes{'titlepage_long_title'}{'node_next'}{'node_up'} = 
$result_nodes{'titlepage_long_title'};
+$result_nodes{'titlepage_long_title'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'titlepage_long_title'};
+$result_nodes{'titlepage_long_title'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'titlepage_long_title'};
 
 $result_menus{'titlepage_long_title'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'titlepage_long_title'} = [];
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index b2532dcaf3..4a75a41a22 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -168,7 +168,8 @@ $result_trees{'titlepage_no_author'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -248,7 +249,8 @@ $result_trees{'titlepage_no_author'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -377,7 +379,8 @@ $result_sectioning{'titlepage_no_author'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -392,7 +395,8 @@ $result_sectioning{'titlepage_no_author'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -431,35 +435,40 @@ $result_nodes{'titlepage_no_author'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'titlepage_no_author'}{'node_next'}{'node_prev'} = 
$result_nodes{'titlepage_no_author'};
-$result_nodes{'titlepage_no_author'}{'node_next'}{'node_up'} = 
$result_nodes{'titlepage_no_author'};
+$result_nodes{'titlepage_no_author'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'titlepage_no_author'};
+$result_nodes{'titlepage_no_author'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'titlepage_no_author'};
 
 $result_menus{'titlepage_no_author'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'titlepage_no_author'} = [];
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index c24329f3ff..2023578b9e 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -202,7 +202,8 @@ $result_trees{'titlepage_no_title'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -282,7 +283,8 @@ $result_trees{'titlepage_no_title'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -419,7 +421,8 @@ $result_sectioning{'titlepage_no_title'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -434,7 +437,8 @@ $result_sectioning{'titlepage_no_title'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -473,35 +477,40 @@ $result_nodes{'titlepage_no_title'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'titlepage_no_title'}{'node_next'}{'node_prev'} = 
$result_nodes{'titlepage_no_title'};
-$result_nodes{'titlepage_no_title'}{'node_next'}{'node_up'} = 
$result_nodes{'titlepage_no_title'};
+$result_nodes{'titlepage_no_title'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'titlepage_no_title'};
+$result_nodes{'titlepage_no_title'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'titlepage_no_title'};
 
 $result_menus{'titlepage_no_title'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'titlepage_no_title'} = [];
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index f8c8ec54bd..d955bcc65e 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -618,7 +618,8 @@ $result_trees{'titlepage_with_commands_classical'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -698,7 +699,8 @@ $result_trees{'titlepage_with_commands_classical'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -925,7 +927,8 @@ $result_sectioning{'titlepage_with_commands_classical'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -940,7 +943,8 @@ $result_sectioning{'titlepage_with_commands_classical'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -979,35 +983,40 @@ $result_nodes{'titlepage_with_commands_classical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'titlepage_with_commands_classical'}{'node_next'}{'node_prev'} = 
$result_nodes{'titlepage_with_commands_classical'};
-$result_nodes{'titlepage_with_commands_classical'}{'node_next'}{'node_up'} = 
$result_nodes{'titlepage_with_commands_classical'};
+$result_nodes{'titlepage_with_commands_classical'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'titlepage_with_commands_classical'};
+$result_nodes{'titlepage_with_commands_classical'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'titlepage_with_commands_classical'};
 
 $result_menus{'titlepage_with_commands_classical'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'titlepage_with_commands_classical'} = [
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index 7cac0b5279..9c695c57cd 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation'}{'menu_child'};
-$result_nodes{'navigation'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation'};
-$result_nodes{'navigation'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation'};
-$result_nodes{'navigation'}{'node_next'} = 
$result_nodes{'navigation'}{'menu_child'};
+$result_nodes{'navigation'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation'}{'structure'}{'menu_child'};
+$result_nodes{'navigation'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation'};
+$result_nodes{'navigation'}{'structure'}{'menu_child'}{'structure'}{'node_up'} 
= $result_nodes{'navigation'};
+$result_nodes{'navigation'}{'structure'}{'node_next'} = 
$result_nodes{'navigation'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation'}{'menu_child'};
-$result_menus{'navigation'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation'};
+$result_menus{'navigation'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation'}{'structure'}{'menu_child'};
+$result_menus{'navigation'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} 
= $result_menus{'navigation'};
 
 $result_errors{'navigation'} = [];
 
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index be134ac799..5432b716a1 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_chapter'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_chapter'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_chapter'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_chapter'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_chapter'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_chapter'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_chapter'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_chapter'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_chapter'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_chapter'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_chapter'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_chapter'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_chapter'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_chapter'}{'menu_child'};
-$result_nodes{'navigation_chapter'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_chapter'};
-$result_nodes{'navigation_chapter'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_chapter'};
-$result_nodes{'navigation_chapter'}{'node_next'} = 
$result_nodes{'navigation_chapter'}{'menu_child'};
+$result_nodes{'navigation_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_chapter'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_chapter'};
+$result_nodes{'navigation_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_chapter'};
+$result_nodes{'navigation_chapter'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_chapter'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_chapter'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_chapter'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_chapter'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_chapter'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_chapter'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_chapter'}{'menu_child'};
-$result_menus{'navigation_chapter'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_chapter'};
+$result_menus{'navigation_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_chapter'}{'structure'}{'menu_child'};
+$result_menus{'navigation_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_chapter'};
 
 $result_errors{'navigation_chapter'} = [];
 
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index ee0ab1739a..68b6d142cf 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_chapter_no_header'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_chapter_no_header'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_chapter_no_header'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_chapter_no_header'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_chapter_no_header'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_chapter_no_header'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_chapter_no_header'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_chapter_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_chapter_no_header'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_chapter_no_header'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_chapter_no_header'}{'menu_child'};
-$result_nodes{'navigation_chapter_no_header'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_chapter_no_header'};
-$result_nodes{'navigation_chapter_no_header'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_chapter_no_header'};
-$result_nodes{'navigation_chapter_no_header'}{'node_next'} = 
$result_nodes{'navigation_chapter_no_header'}{'menu_child'};
+$result_nodes{'navigation_chapter_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_chapter_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_chapter_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_chapter_no_header'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_chapter_no_header'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_chapter_no_header'};
+$result_nodes{'navigation_chapter_no_header'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_chapter_no_header'};
+$result_nodes{'navigation_chapter_no_header'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_chapter_no_header'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_chapter_no_header'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_chapter_no_header'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_chapter_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_chapter_no_header'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_chapter_no_header'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_chapter_no_header'}{'menu_child'};
-$result_menus{'navigation_chapter_no_header'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_chapter_no_header'};
+$result_menus{'navigation_chapter_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_chapter_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_chapter_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_chapter_no_header'}{'structure'}{'menu_child'};
+$result_menus{'navigation_chapter_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_chapter_no_header'};
 
 $result_errors{'navigation_chapter_no_header'} = [];
 
diff --git a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl 
b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
index a548f12b66..f2701e4875 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_chapter_no_header_vertical'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_chapter_no_header_vertical'} 
= {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'};
-$result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'}{'node_prev'}
 = $result_nodes{'navigation_chapter_no_header_vertical'};
-$result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_chapter_no_header_vertical'};
-$result_nodes{'navigation_chapter_no_header_vertical'}{'node_next'} = 
$result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'};
+$result_nodes{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_chapter_no_header_vertical'};
+$result_nodes{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_chapter_no_header_vertical'};
+$result_nodes{'navigation_chapter_no_header_vertical'}{'structure'}{'node_next'}
 = 
$result_nodes{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_chapter_no_header_vertical'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_chapter_no_header_vertical'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_chapter_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'navigation_chapter_no_header_vertical'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_chapter_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_chapter_no_header_vertical'}{'menu_child'};
-$result_menus{'navigation_chapter_no_header_vertical'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_chapter_no_header_vertical'};
+$result_menus{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'};
+$result_menus{'navigation_chapter_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_chapter_no_header_vertical'};
 
 $result_errors{'navigation_chapter_no_header_vertical'} = [];
 
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index ddc464f740..c5d9824e04 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_chapter_vertical'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_chapter_vertical'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_chapter_vertical'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_chapter_vertical'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_chapter_vertical'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_chapter_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_chapter_vertical'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_chapter_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_chapter_vertical'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_chapter_vertical'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_chapter_vertical'}{'menu_child'};
-$result_nodes{'navigation_chapter_vertical'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_chapter_vertical'};
-$result_nodes{'navigation_chapter_vertical'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_chapter_vertical'};
-$result_nodes{'navigation_chapter_vertical'}{'node_next'} = 
$result_nodes{'navigation_chapter_vertical'}{'menu_child'};
+$result_nodes{'navigation_chapter_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_chapter_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_chapter_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_chapter_vertical'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_chapter_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_chapter_vertical'};
+$result_nodes{'navigation_chapter_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_chapter_vertical'};
+$result_nodes{'navigation_chapter_vertical'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_chapter_vertical'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_chapter_vertical'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_chapter_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_chapter_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_chapter_vertical'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_chapter_vertical'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_chapter_vertical'}{'menu_child'};
-$result_menus{'navigation_chapter_vertical'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_chapter_vertical'};
+$result_menus{'navigation_chapter_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_chapter_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_chapter_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_chapter_vertical'}{'structure'}{'menu_child'};
+$result_menus{'navigation_chapter_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_chapter_vertical'};
 
 $result_errors{'navigation_chapter_vertical'} = [];
 
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index 2e00c755cd..442496a367 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_no_header'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_no_header'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_no_header'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_no_header'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_no_header'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_no_header'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_no_header'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_no_header'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_no_header'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_no_header'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_no_header'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_no_header'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_no_header'}{'menu_child'};
-$result_nodes{'navigation_no_header'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_no_header'};
-$result_nodes{'navigation_no_header'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_no_header'};
-$result_nodes{'navigation_no_header'}{'node_next'} = 
$result_nodes{'navigation_no_header'}{'menu_child'};
+$result_nodes{'navigation_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_no_header'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_no_header'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_no_header'};
+$result_nodes{'navigation_no_header'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_no_header'};
+$result_nodes{'navigation_no_header'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_no_header'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_no_header'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_no_header'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_no_header'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_no_header'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_no_header'}{'menu_child'};
-$result_menus{'navigation_no_header'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_no_header'};
+$result_menus{'navigation_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_no_header'}{'structure'}{'menu_child'};
+$result_menus{'navigation_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_no_header'};
 
 $result_errors{'navigation_no_header'} = [];
 
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index d0a1f754bd..b84fff962c 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_no_header_vertical'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_no_header_vertical'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_no_header_vertical'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_no_header_vertical'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_no_header_vertical'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_no_header_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_no_header_vertical'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_no_header_vertical'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_no_header_vertical'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_no_header_vertical'}{'menu_child'};
-$result_nodes{'navigation_no_header_vertical'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_no_header_vertical'};
-$result_nodes{'navigation_no_header_vertical'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_no_header_vertical'};
-$result_nodes{'navigation_no_header_vertical'}{'node_next'} = 
$result_nodes{'navigation_no_header_vertical'}{'menu_child'};
+$result_nodes{'navigation_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_no_header_vertical'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_no_header_vertical'};
+$result_nodes{'navigation_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_no_header_vertical'};
+$result_nodes{'navigation_no_header_vertical'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_no_header_vertical'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_no_header_vertical'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_no_header_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_no_header_vertical'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_no_header_vertical'}{'menu_child'};
-$result_menus{'navigation_no_header_vertical'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_no_header_vertical'};
+$result_menus{'navigation_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_no_header_vertical'}{'structure'}{'menu_child'};
+$result_menus{'navigation_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_no_header_vertical'};
 
 $result_errors{'navigation_no_header_vertical'} = [];
 
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index 8c58536377..0c8e0f5f84 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_node'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_node'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_node'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_node'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_node'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_node'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_node'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_node'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_node'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_node'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_node'}{'menu_child'};
-$result_nodes{'navigation_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_node'};
-$result_nodes{'navigation_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_node'};
-$result_nodes{'navigation_node'}{'node_next'} = 
$result_nodes{'navigation_node'}{'menu_child'};
+$result_nodes{'navigation_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_node'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_node'};
+$result_nodes{'navigation_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_node'};
+$result_nodes{'navigation_node'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_node'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_node'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_node'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_node'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_node'}{'menu_child'};
-$result_menus{'navigation_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_node'};
+$result_menus{'navigation_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_node'}{'structure'}{'menu_child'};
+$result_menus{'navigation_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_node'};
 
 $result_errors{'navigation_node'} = [];
 
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index 887b1d69ef..c9c5e67299 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_node_no_header'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_node_no_header'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_node_no_header'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_node_no_header'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_node_no_header'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_node_no_header'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_node_no_header'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_node_no_header'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_node_no_header'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_node_no_header'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_node_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_node_no_header'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_node_no_header'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_node_no_header'}{'menu_child'};
-$result_nodes{'navigation_node_no_header'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_node_no_header'};
-$result_nodes{'navigation_node_no_header'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_node_no_header'};
-$result_nodes{'navigation_node_no_header'}{'node_next'} = 
$result_nodes{'navigation_node_no_header'}{'menu_child'};
+$result_nodes{'navigation_node_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_node_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_node_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_node_no_header'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_node_no_header'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_node_no_header'};
+$result_nodes{'navigation_node_no_header'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_node_no_header'};
+$result_nodes{'navigation_node_no_header'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_node_no_header'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_node_no_header'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_node_no_header'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_node_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_node_no_header'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_node_no_header'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_node_no_header'}{'menu_child'};
-$result_menus{'navigation_node_no_header'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_node_no_header'};
+$result_menus{'navigation_node_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_node_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_node_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_node_no_header'}{'structure'}{'menu_child'};
+$result_menus{'navigation_node_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_node_no_header'};
 
 $result_errors{'navigation_node_no_header'} = [];
 
diff --git a/tp/t/results/layout/navigation_node_no_header_vertical.pl 
b/tp/t/results/layout/navigation_node_no_header_vertical.pl
index 458c839acc..cc81c45c6a 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_node_no_header_vertical'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_node_no_header_vertical'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_node_no_header_vertical'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_node_no_header_vertical'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_node_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'navigation_node_no_header_vertical'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_node_no_header_vertical'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_node_no_header_vertical'}{'menu_child'};
-$result_nodes{'navigation_node_no_header_vertical'}{'menu_child'}{'node_prev'} 
= $result_nodes{'navigation_node_no_header_vertical'};
-$result_nodes{'navigation_node_no_header_vertical'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_node_no_header_vertical'};
-$result_nodes{'navigation_node_no_header_vertical'}{'node_next'} = 
$result_nodes{'navigation_node_no_header_vertical'}{'menu_child'};
+$result_nodes{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_node_no_header_vertical'};
+$result_nodes{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_node_no_header_vertical'};
+$result_nodes{'navigation_node_no_header_vertical'}{'structure'}{'node_next'} 
= 
$result_nodes{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_node_no_header_vertical'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_node_no_header_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_node_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'navigation_node_no_header_vertical'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_node_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_node_no_header_vertical'}{'menu_child'};
-$result_menus{'navigation_node_no_header_vertical'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_node_no_header_vertical'};
+$result_menus{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'};
+$result_menus{'navigation_node_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_node_no_header_vertical'};
 
 $result_errors{'navigation_node_no_header_vertical'} = [];
 
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index c40efecdcb..353a14cd92 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_node_vertical'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_node_vertical'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_node_vertical'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_node_vertical'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_node_vertical'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_node_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_node_vertical'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_node_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_node_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_node_vertical'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_node_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_node_vertical'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_node_vertical'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_node_vertical'}{'menu_child'};
-$result_nodes{'navigation_node_vertical'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_node_vertical'};
-$result_nodes{'navigation_node_vertical'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_node_vertical'};
-$result_nodes{'navigation_node_vertical'}{'node_next'} = 
$result_nodes{'navigation_node_vertical'}{'menu_child'};
+$result_nodes{'navigation_node_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_node_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_node_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_node_vertical'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_node_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_node_vertical'};
+$result_nodes{'navigation_node_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_node_vertical'};
+$result_nodes{'navigation_node_vertical'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_node_vertical'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_node_vertical'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_node_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_node_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_node_vertical'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_node_vertical'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_node_vertical'}{'menu_child'};
-$result_menus{'navigation_node_vertical'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_node_vertical'};
+$result_menus{'navigation_node_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_node_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_node_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_node_vertical'}{'structure'}{'menu_child'};
+$result_menus{'navigation_node_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_node_vertical'};
 
 $result_errors{'navigation_node_vertical'} = [];
 
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index 5af9fbd964..3c9fe0bd26 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_section'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_section'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_section'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_section'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_section'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_section'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_section'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_section'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_section'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_section'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_section'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_section'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_section'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_section'}{'menu_child'};
-$result_nodes{'navigation_section'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_section'};
-$result_nodes{'navigation_section'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_section'};
-$result_nodes{'navigation_section'}{'node_next'} = 
$result_nodes{'navigation_section'}{'menu_child'};
+$result_nodes{'navigation_section'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_section'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_section'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_section'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_section'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_section'};
+$result_nodes{'navigation_section'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_section'};
+$result_nodes{'navigation_section'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_section'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_section'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_section'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_section'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_section'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_section'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_section'}{'menu_child'};
-$result_menus{'navigation_section'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_section'};
+$result_menus{'navigation_section'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_section'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_section'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_section'}{'structure'}{'menu_child'};
+$result_menus{'navigation_section'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_section'};
 
 $result_errors{'navigation_section'} = [];
 
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index 2c2b2a827a..e2d7143745 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_section_no_header'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_section_no_header'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_section_no_header'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_section_no_header'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_section_no_header'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_section_no_header'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_section_no_header'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_section_no_header'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_section_no_header'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_section_no_header'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_section_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_section_no_header'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_section_no_header'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_section_no_header'}{'menu_child'};
-$result_nodes{'navigation_section_no_header'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_section_no_header'};
-$result_nodes{'navigation_section_no_header'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_section_no_header'};
-$result_nodes{'navigation_section_no_header'}{'node_next'} = 
$result_nodes{'navigation_section_no_header'}{'menu_child'};
+$result_nodes{'navigation_section_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_section_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_section_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_section_no_header'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_section_no_header'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_section_no_header'};
+$result_nodes{'navigation_section_no_header'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_section_no_header'};
+$result_nodes{'navigation_section_no_header'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_section_no_header'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_section_no_header'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_section_no_header'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_section_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_section_no_header'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_section_no_header'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_section_no_header'}{'menu_child'};
-$result_menus{'navigation_section_no_header'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_section_no_header'};
+$result_menus{'navigation_section_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_section_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_section_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_section_no_header'}{'structure'}{'menu_child'};
+$result_menus{'navigation_section_no_header'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_section_no_header'};
 
 $result_errors{'navigation_section_no_header'} = [];
 
diff --git a/tp/t/results/layout/navigation_section_no_header_vertical.pl 
b/tp/t/results/layout/navigation_section_no_header_vertical.pl
index e6422c62e2..5b9f1abc8d 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_section_no_header_vertical'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_section_no_header_vertical'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_section_no_header_vertical'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_section_no_header_vertical'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_section_no_header_vertical'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_section_no_header_vertical'} 
= {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_section_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'navigation_section_no_header_vertical'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_section_no_header_vertical'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_section_no_header_vertical'}{'menu_child'};
-$result_nodes{'navigation_section_no_header_vertical'}{'menu_child'}{'node_prev'}
 = $result_nodes{'navigation_section_no_header_vertical'};
-$result_nodes{'navigation_section_no_header_vertical'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_section_no_header_vertical'};
-$result_nodes{'navigation_section_no_header_vertical'}{'node_next'} = 
$result_nodes{'navigation_section_no_header_vertical'}{'menu_child'};
+$result_nodes{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_section_no_header_vertical'};
+$result_nodes{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_section_no_header_vertical'};
+$result_nodes{'navigation_section_no_header_vertical'}{'structure'}{'node_next'}
 = 
$result_nodes{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_section_no_header_vertical'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_section_no_header_vertical'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_section_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'navigation_section_no_header_vertical'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_section_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_section_no_header_vertical'}{'menu_child'};
-$result_menus{'navigation_section_no_header_vertical'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_section_no_header_vertical'};
+$result_menus{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'};
+$result_menus{'navigation_section_no_header_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_section_no_header_vertical'};
 
 $result_errors{'navigation_section_no_header_vertical'} = [];
 
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index d8bb98c242..5e6984850a 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_section_vertical'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_section_vertical'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_section_vertical'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_section_vertical'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_section_vertical'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_section_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_section_vertical'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_section_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_section_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_section_vertical'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_section_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_section_vertical'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_section_vertical'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_section_vertical'}{'menu_child'};
-$result_nodes{'navigation_section_vertical'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_section_vertical'};
-$result_nodes{'navigation_section_vertical'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_section_vertical'};
-$result_nodes{'navigation_section_vertical'}{'node_next'} = 
$result_nodes{'navigation_section_vertical'}{'menu_child'};
+$result_nodes{'navigation_section_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_section_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_section_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_section_vertical'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_section_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_section_vertical'};
+$result_nodes{'navigation_section_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_section_vertical'};
+$result_nodes{'navigation_section_vertical'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_section_vertical'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_section_vertical'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_section_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_section_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_section_vertical'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_section_vertical'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_section_vertical'}{'menu_child'};
-$result_menus{'navigation_section_vertical'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_section_vertical'};
+$result_menus{'navigation_section_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_section_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_section_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_section_vertical'}{'structure'}{'menu_child'};
+$result_menus{'navigation_section_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_section_vertical'};
 
 $result_errors{'navigation_section_vertical'} = [];
 
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index f8afe640e9..7af336ff5e 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -111,7 +111,8 @@ $result_trees{'navigation_vertical'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -307,7 +308,8 @@ $result_trees{'navigation_vertical'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +506,8 @@ $result_trees{'navigation_vertical'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -927,7 +930,8 @@ $result_trees{'navigation_vertical'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1274,7 +1278,8 @@ $result_sectioning{'navigation_vertical'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1289,7 +1294,8 @@ $result_sectioning{'navigation_vertical'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1305,7 +1311,8 @@ $result_sectioning{'navigation_vertical'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1321,7 +1328,8 @@ $result_sectioning{'navigation_vertical'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1370,56 +1378,38 @@ $result_nodes{'navigation_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1435,48 +1425,74 @@ $result_nodes{'navigation_vertical'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'navigation_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'navigation_vertical'}{'menu_child'}{'menu_child'};
-$result_nodes{'navigation_vertical'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_vertical'}{'menu_child'};
-$result_nodes{'navigation_vertical'}{'menu_child'}{'node_prev'} = 
$result_nodes{'navigation_vertical'};
-$result_nodes{'navigation_vertical'}{'menu_child'}{'node_up'} = 
$result_nodes{'navigation_vertical'};
-$result_nodes{'navigation_vertical'}{'node_next'} = 
$result_nodes{'navigation_vertical'}{'menu_child'};
+$result_nodes{'navigation_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'navigation_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_vertical'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'navigation_vertical'};
+$result_nodes{'navigation_vertical'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'navigation_vertical'};
+$result_nodes{'navigation_vertical'}{'structure'}{'node_next'} = 
$result_nodes{'navigation_vertical'}{'structure'}{'menu_child'};
 
 $result_menus{'navigation_vertical'} = {
   'cmdname' => 'node',
@@ -1484,43 +1500,51 @@ $result_menus{'navigation_vertical'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'navigation_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'navigation_vertical'}{'menu_child'}{'menu_child'};
-$result_menus{'navigation_vertical'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_vertical'}{'menu_child'};
-$result_menus{'navigation_vertical'}{'menu_child'}{'menu_up'} = 
$result_menus{'navigation_vertical'};
+$result_menus{'navigation_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'navigation_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_vertical'}{'structure'}{'menu_child'};
+$result_menus{'navigation_vertical'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'navigation_vertical'};
 
 $result_errors{'navigation_vertical'} = [];
 
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 78d45ea30a..39a4792252 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -111,7 +111,8 @@ $result_trees{'no_monolithic'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -404,7 +405,8 @@ $result_trees{'no_monolithic'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -681,7 +683,8 @@ $result_sectioning{'no_monolithic'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -697,7 +700,8 @@ $result_sectioning{'no_monolithic'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -736,26 +740,6 @@ $result_nodes{'no_monolithic'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'isindex' => 1,
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -771,11 +755,35 @@ $result_nodes{'no_monolithic'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'isindex' => 1,
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'no_monolithic'}{'menu_child'}{'node_prev'} = 
$result_nodes{'no_monolithic'};
-$result_nodes{'no_monolithic'}{'menu_child'}{'node_up'} = 
$result_nodes{'no_monolithic'};
-$result_nodes{'no_monolithic'}{'node_next'} = 
$result_nodes{'no_monolithic'}{'menu_child'};
+$result_nodes{'no_monolithic'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'no_monolithic'};
+$result_nodes{'no_monolithic'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'no_monolithic'};
+$result_nodes{'no_monolithic'}{'structure'}{'node_next'} = 
$result_nodes{'no_monolithic'}{'structure'}{'menu_child'};
 
 $result_menus{'no_monolithic'} = {
   'cmdname' => 'node',
@@ -783,20 +791,24 @@ $result_menus{'no_monolithic'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'no_monolithic'}{'menu_child'}{'menu_up'} = 
$result_menus{'no_monolithic'};
+$result_menus{'no_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'no_monolithic'};
 
 $result_errors{'no_monolithic'} = [];
 
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 5287e7872a..cb70942f12 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -304,7 +304,8 @@ $result_trees{'backslash_in_arg'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -379,7 +380,8 @@ $result_nodes{'backslash_in_arg'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'backslash_in_arg'} = {
@@ -388,7 +390,8 @@ $result_menus{'backslash_in_arg'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'backslash_in_arg'} = [];
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index c5497df54a..8d49cada1d 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -893,7 +893,8 @@ $result_trees{'macro_in_index_commands'} = {
         'line_nr' => 36,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -1099,7 +1100,8 @@ $result_nodes{'macro_in_index_commands'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'macro_in_index_commands'} = {
@@ -1108,7 +1110,8 @@ $result_menus{'macro_in_index_commands'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'macro_in_index_commands'} = [
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index ad748f0f71..6e7c0ff256 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -142,7 +142,8 @@ $result_trees{'macro_in_misc_commands'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3331,7 +3332,8 @@ $result_trees{'macro_in_misc_commands'} = {
         'line_nr' => 203,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4284,7 +4286,8 @@ $result_sectioning{'macro_in_misc_commands'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -4299,7 +4302,8 @@ $result_sectioning{'macro_in_misc_commands'} = {
                   'extra' => {
                     'normalized' => 'node-atext',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -4338,25 +4342,6 @@ $result_nodes{'macro_in_misc_commands'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'node-atext',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -4372,11 +4357,34 @@ $result_nodes{'macro_in_misc_commands'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'node-atext',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'macro_in_misc_commands'}{'menu_child'}{'node_prev'} = 
$result_nodes{'macro_in_misc_commands'};
-$result_nodes{'macro_in_misc_commands'}{'menu_child'}{'node_up'} = 
$result_nodes{'macro_in_misc_commands'};
-$result_nodes{'macro_in_misc_commands'}{'node_next'} = 
$result_nodes{'macro_in_misc_commands'}{'menu_child'};
+$result_nodes{'macro_in_misc_commands'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'macro_in_misc_commands'};
+$result_nodes{'macro_in_misc_commands'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'macro_in_misc_commands'};
+$result_nodes{'macro_in_misc_commands'}{'structure'}{'node_next'} = 
$result_nodes{'macro_in_misc_commands'}{'structure'}{'menu_child'};
 
 $result_menus{'macro_in_misc_commands'} = {
   'cmdname' => 'node',
@@ -4384,19 +4392,23 @@ $result_menus{'macro_in_misc_commands'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node-atext',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'node-atext',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'macro_in_misc_commands'}{'menu_child'}{'menu_up'} = 
$result_menus{'macro_in_misc_commands'};
+$result_menus{'macro_in_misc_commands'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'macro_in_misc_commands'};
 
 $result_errors{'macro_in_misc_commands'} = [
   {
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl 
b/tp/t/results/menu/block_commands_in_menu_description.pl
index 3d05c77bea..597ec094af 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -51,7 +51,8 @@ $result_trees{'block_commands_in_menu_description'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -735,7 +736,8 @@ $result_sectioning{'block_commands_in_menu_description'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -764,15 +766,6 @@ $result_nodes{'block_commands_in_menu_description'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'manual'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -788,9 +781,20 @@ $result_nodes{'block_commands_in_menu_description'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'manual'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'block_commands_in_menu_description'}{'node_next'} = 
$result_nodes{'block_commands_in_menu_description'}{'menu_child'};
+$result_nodes{'block_commands_in_menu_description'}{'structure'}{'node_next'} 
= 
$result_nodes{'block_commands_in_menu_description'}{'structure'}{'menu_child'};
 
 $result_menus{'block_commands_in_menu_description'} = {
   'cmdname' => 'node',
@@ -798,13 +802,15 @@ $result_menus{'block_commands_in_menu_description'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'manual'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'manual'
+          }
+        ]
+      }
     }
   }
 };
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index 5cbdf7c68d..c1dda3d35c 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -193,7 +193,8 @@ $result_trees{'comment_on_menu_line'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -267,7 +268,8 @@ $result_trees{'comment_on_menu_line'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -337,7 +339,8 @@ $result_sectioning{'comment_on_menu_line'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -368,15 +371,6 @@ $result_nodes{'comment_on_menu_line'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -393,11 +387,24 @@ $result_nodes{'comment_on_menu_line'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'comment_on_menu_line'}{'menu_child'}{'node_prev'} = 
$result_nodes{'comment_on_menu_line'};
-$result_nodes{'comment_on_menu_line'}{'menu_child'}{'node_up'} = 
$result_nodes{'comment_on_menu_line'};
-$result_nodes{'comment_on_menu_line'}{'node_next'} = 
$result_nodes{'comment_on_menu_line'}{'menu_child'};
+$result_nodes{'comment_on_menu_line'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'comment_on_menu_line'};
+$result_nodes{'comment_on_menu_line'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'comment_on_menu_line'};
+$result_nodes{'comment_on_menu_line'}{'structure'}{'node_next'} = 
$result_nodes{'comment_on_menu_line'}{'structure'}{'menu_child'};
 
 $result_menus{'comment_on_menu_line'} = {
   'cmdname' => 'node',
@@ -405,19 +412,23 @@ $result_menus{'comment_on_menu_line'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'comment_on_menu_line'}{'menu_child'}{'menu_up'} = 
$result_menus{'comment_on_menu_line'};
+$result_menus{'comment_on_menu_line'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'comment_on_menu_line'};
 
 $result_errors{'comment_on_menu_line'} = [];
 
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index a542de6414..9210a39246 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -51,7 +51,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -640,7 +641,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -837,7 +839,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -918,7 +921,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1172,7 +1176,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1253,7 +1258,8 @@ $result_trees{'detailmenu_on_subnodes'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1564,7 +1570,8 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1579,7 +1586,8 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1595,7 +1603,8 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1619,7 +1628,8 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                   'extra' => {
                     'normalized' => 'chapter-2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1635,7 +1645,8 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                         'extra' => {
                           'normalized' => 'section-chap-2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1653,7 +1664,8 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1705,154 +1717,166 @@ $result_nodes{'detailmenu_on_subnodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
           }
         }
-      }
-    ],
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 1,
-            'number' => 2
+            'node_up' => {}
           }
         },
-        'normalized' => 'chapter-2',
-        'spaces_before_argument' => ' '
-      },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2,
-              'number' => '2.1'
-            }
-          },
-          'normalized' => 'section-chap-2',
-          'spaces_before_argument' => ' '
-        },
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'unnumberedsec',
+              'cmdname' => 'chapter',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 2
+                'level' => 1,
+                'number' => 2
               }
             },
-            'normalized' => 'unnumberedsec',
+            'normalized' => 'chapter-2',
             'spaces_before_argument' => ' '
           },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_up' => {}
-      },
-      'menus' => [
-        {
-          'cmdname' => 'menu',
-          'extra' => {
-            'end_command' => {
-              'cmdname' => 'end',
+          'menus' => [
+            {
+              'cmdname' => 'menu',
               'extra' => {
-                'command_argument' => 'menu',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'menu'
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
               }
             }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'section',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2,
+                    'number' => '2.1'
+                  }
+                },
+                'normalized' => 'section-chap-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'unnumberedsec',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 2
+                      }
+                    },
+                    'normalized' => 'unnumberedsec',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
-      ],
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'menu_child'}{'node_up'} 
= $result_nodes{'detailmenu_on_subnodes'}{'menu_child'};
-$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'}{'menu_child'};
-$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'};
-$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = $result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'};
-$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'detailmenu_on_subnodes'}{'menu_child'};
-$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'}{'node_up'} 
= $result_nodes{'detailmenu_on_subnodes'};
-$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'detailmenu_on_subnodes'};
-$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'detailmenu_on_subnodes'};
-$result_nodes{'detailmenu_on_subnodes'}{'node_next'} = 
$result_nodes{'detailmenu_on_subnodes'}{'menu_child'};
+$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'};
+$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'};
+$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'detailmenu_on_subnodes'};
+$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'detailmenu_on_subnodes'};
+$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'detailmenu_on_subnodes'};
+$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'node_next'} = 
$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'menu_child'};
 
 $result_menus{'detailmenu_on_subnodes'} = {
   'cmdname' => 'node',
@@ -1860,71 +1884,83 @@ $result_menus{'detailmenu_on_subnodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
-        'spaces_before_argument' => ' '
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'chapter-2',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'section-chap-2',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'unnumberedsec',
+            'normalized' => 'chapter-2',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'chapter-2' => 1
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'section-chap-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'unnumberedsec',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'chapter-2' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'chapter-2' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'chapter-2' => 1
+          'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_child'}{'menu_up'} 
= $result_menus{'detailmenu_on_subnodes'}{'menu_child'};
-$result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_next'}{'menu_child'};
-$result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_next'};
-$result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_next'};
-$result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'detailmenu_on_subnodes'}{'menu_child'};
-$result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_next'}{'menu_up'} 
= $result_menus{'detailmenu_on_subnodes'};
-$result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'detailmenu_on_subnodes'};
+$result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'};
+$result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'};
+$result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'detailmenu_on_subnodes'};
+$result_menus{'detailmenu_on_subnodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'detailmenu_on_subnodes'};
 
 $result_errors{'detailmenu_on_subnodes'} = [];
 
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 8834a3a1c8..5492dc7ac5 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -221,7 +221,8 @@ $result_trees{'detailmenu_unknown_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -292,7 +293,8 @@ $result_nodes{'detailmenu_unknown_node'} = {
         }
       }
     }
-  ]
+  ],
+  'structure' => {}
 };
 
 $result_menus{'detailmenu_unknown_node'} = {
@@ -300,7 +302,8 @@ $result_menus{'detailmenu_unknown_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'detailmenu_unknown_node'} = [
diff --git a/tp/t/results/menu/direntry_dircategory_after_first_node.pl 
b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
index 75e38f626b..caf12e1b60 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -51,7 +51,8 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -321,7 +322,8 @@ $result_sectioning{'direntry_dircategory_after_first_node'} 
= {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -349,7 +351,8 @@ $result_nodes{'direntry_dircategory_after_first_node'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'direntry_dircategory_after_first_node'} = {
@@ -357,7 +360,8 @@ $result_menus{'direntry_dircategory_after_first_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'direntry_dircategory_after_first_node'} = [
diff --git a/tp/t/results/menu/empty_menu_entry_name.pl 
b/tp/t/results/menu/empty_menu_entry_name.pl
index 907ebc1017..c2400098ec 100644
--- a/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/tp/t/results/menu/empty_menu_entry_name.pl
@@ -260,7 +260,8 @@ $result_trees{'empty_menu_entry_name'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -301,7 +302,8 @@ $result_trees{'empty_menu_entry_name'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -378,15 +380,6 @@ $result_nodes{'empty_menu_entry_name'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'vvv'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -402,9 +395,20 @@ $result_nodes{'empty_menu_entry_name'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'vvv'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'empty_menu_entry_name'}{'node_next'} = 
$result_nodes{'empty_menu_entry_name'}{'menu_child'};
+$result_nodes{'empty_menu_entry_name'}{'structure'}{'node_next'} = 
$result_nodes{'empty_menu_entry_name'}{'structure'}{'menu_child'};
 
 $result_menus{'empty_menu_entry_name'} = {
   'cmdname' => 'node',
@@ -412,13 +416,15 @@ $result_menus{'empty_menu_entry_name'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'vvv'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'vvv'
+          }
+        ]
+      }
     }
   }
 };
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index 10059afc96..e8b3afc464 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -498,7 +498,8 @@ $result_trees{'entry_after_detailmenu'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -539,7 +540,8 @@ $result_trees{'entry_after_detailmenu'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -580,7 +582,8 @@ $result_trees{'entry_after_detailmenu'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -713,24 +716,6 @@ $result_nodes{'entry_after_detailmenu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'second',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -746,13 +731,37 @@ $result_nodes{'entry_after_detailmenu'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'second',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'entry_after_detailmenu'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'entry_after_detailmenu'}{'menu_child'};
-$result_nodes{'entry_after_detailmenu'}{'menu_child'}{'node_next'}{'node_up'} 
= $result_nodes{'entry_after_detailmenu'};
-$result_nodes{'entry_after_detailmenu'}{'menu_child'}{'node_prev'} = 
$result_nodes{'entry_after_detailmenu'};
-$result_nodes{'entry_after_detailmenu'}{'menu_child'}{'node_up'} = 
$result_nodes{'entry_after_detailmenu'};
-$result_nodes{'entry_after_detailmenu'}{'node_next'} = 
$result_nodes{'entry_after_detailmenu'}{'menu_child'};
+$result_nodes{'entry_after_detailmenu'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'entry_after_detailmenu'}{'structure'}{'menu_child'};
+$result_nodes{'entry_after_detailmenu'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'entry_after_detailmenu'};
+$result_nodes{'entry_after_detailmenu'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'entry_after_detailmenu'};
+$result_nodes{'entry_after_detailmenu'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'entry_after_detailmenu'};
+$result_nodes{'entry_after_detailmenu'}{'structure'}{'node_next'} = 
$result_nodes{'entry_after_detailmenu'}{'structure'}{'menu_child'};
 
 $result_menus{'entry_after_detailmenu'} = {
   'cmdname' => 'node',
@@ -760,33 +769,39 @@ $result_menus{'entry_after_detailmenu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'second',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'entry_after_detailmenu'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'entry_after_detailmenu'}{'menu_child'};
-$result_menus{'entry_after_detailmenu'}{'menu_child'}{'menu_next'}{'menu_up'} 
= $result_menus{'entry_after_detailmenu'};
-$result_menus{'entry_after_detailmenu'}{'menu_child'}{'menu_up'} = 
$result_menus{'entry_after_detailmenu'};
+$result_menus{'entry_after_detailmenu'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'entry_after_detailmenu'}{'structure'}{'menu_child'};
+$result_menus{'entry_after_detailmenu'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'entry_after_detailmenu'};
+$result_menus{'entry_after_detailmenu'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'entry_after_detailmenu'};
 
 $result_errors{'entry_after_detailmenu'} = [];
 
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 74973786d0..616a999f2a 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -51,7 +51,8 @@ $result_trees{'example_in_menu_description'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -386,7 +387,8 @@ $result_sectioning{'example_in_menu_description'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -415,15 +417,6 @@ $result_nodes{'example_in_menu_description'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'manual'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -439,9 +432,20 @@ $result_nodes{'example_in_menu_description'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'manual'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'example_in_menu_description'}{'node_next'} = 
$result_nodes{'example_in_menu_description'}{'menu_child'};
+$result_nodes{'example_in_menu_description'}{'structure'}{'node_next'} = 
$result_nodes{'example_in_menu_description'}{'structure'}{'menu_child'};
 
 $result_menus{'example_in_menu_description'} = {
   'cmdname' => 'node',
@@ -449,13 +453,15 @@ $result_menus{'example_in_menu_description'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'manual'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'manual'
+          }
+        ]
+      }
     }
   }
 };
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index 59cb635edc..cf26dc444a 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -759,7 +759,8 @@ $result_trees{'formats_in_menu'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -939,15 +940,6 @@ $result_nodes{'formats_in_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'gcc'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -963,9 +955,20 @@ $result_nodes{'formats_in_menu'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'gcc'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'formats_in_menu'}{'node_next'} = 
$result_nodes{'formats_in_menu'}{'menu_child'};
+$result_nodes{'formats_in_menu'}{'structure'}{'node_next'} = 
$result_nodes{'formats_in_menu'}{'structure'}{'menu_child'};
 
 $result_menus{'formats_in_menu'} = {
   'cmdname' => 'node',
@@ -973,13 +976,15 @@ $result_menus{'formats_in_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'gcc'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'gcc'
+          }
+        ]
+      }
     }
   }
 };
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index 2e2d2220b3..2dcd23997f 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -51,7 +51,8 @@ $result_trees{'inlineraw_in_menu_description'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -359,7 +360,8 @@ $result_sectioning{'inlineraw_in_menu_description'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -388,15 +390,6 @@ $result_nodes{'inlineraw_in_menu_description'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'manual'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -412,9 +405,20 @@ $result_nodes{'inlineraw_in_menu_description'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'manual'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'inlineraw_in_menu_description'}{'node_next'} = 
$result_nodes{'inlineraw_in_menu_description'}{'menu_child'};
+$result_nodes{'inlineraw_in_menu_description'}{'structure'}{'node_next'} = 
$result_nodes{'inlineraw_in_menu_description'}{'structure'}{'menu_child'};
 
 $result_menus{'inlineraw_in_menu_description'} = {
   'cmdname' => 'node',
@@ -422,13 +426,15 @@ $result_menus{'inlineraw_in_menu_description'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'manual'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'manual'
+          }
+        ]
+      }
     }
   }
 };
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index cff1426b2b..ed9b912507 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -625,7 +625,8 @@ $result_trees{'invalid_info_menu_entry'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -767,16 +768,6 @@ $result_nodes{'invalid_info_menu_entry'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'f'
-        }
-      ],
-      'normalized' => 'a_003a'
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -792,9 +783,21 @@ $result_nodes{'invalid_info_menu_entry'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'f'
+          }
+        ],
+        'normalized' => 'a_003a'
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'invalid_info_menu_entry'}{'node_next'} = 
$result_nodes{'invalid_info_menu_entry'}{'menu_child'};
+$result_nodes{'invalid_info_menu_entry'}{'structure'}{'node_next'} = 
$result_nodes{'invalid_info_menu_entry'}{'structure'}{'menu_child'};
 
 $result_menus{'invalid_info_menu_entry'} = {
   'cmdname' => 'node',
@@ -802,14 +805,16 @@ $result_menus{'invalid_info_menu_entry'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'f'
-        }
-      ],
-      'normalized' => 'a_003a'
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'f'
+          }
+        ],
+        'normalized' => 'a_003a'
+      }
     }
   }
 };
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index 4c54fe906a..1e31e032ce 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -313,7 +313,8 @@ $result_trees{'menu_in_deffn'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -385,7 +386,8 @@ $result_nodes{'menu_in_deffn'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'menu_in_deffn'} = {
@@ -393,7 +395,8 @@ $result_menus{'menu_in_deffn'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'menu_in_deffn'} = [
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index 1540c76810..a44ac5b99a 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -554,7 +554,8 @@ $result_trees{'menu_in_example'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -685,7 +686,8 @@ $result_nodes{'menu_in_example'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'menu_in_example'} = {
@@ -693,7 +695,8 @@ $result_menus{'menu_in_example'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'menu_in_example'} = [
diff --git a/tp/t/results/menu/menu_node_unterminated.pl 
b/tp/t/results/menu/menu_node_unterminated.pl
index 9356221174..476cc26ecf 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -174,7 +174,8 @@ $result_trees{'menu_node_unterminated'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -239,7 +240,8 @@ $result_nodes{'menu_node_unterminated'} = {
         }
       }
     }
-  ]
+  ],
+  'structure' => {}
 };
 
 $result_menus{'menu_node_unterminated'} = {
@@ -247,7 +249,8 @@ $result_menus{'menu_node_unterminated'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'menu_node_unterminated'} = [
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index 26cbb8087c..d1cfe7533b 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -51,7 +51,8 @@ $result_trees{'menu_pointing_to_anchor'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -121,7 +122,8 @@ $result_trees{'menu_pointing_to_anchor'} = {
             'line_nr' => 6,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'parent' => {},
@@ -333,7 +335,8 @@ $result_sectioning{'menu_pointing_to_anchor'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -362,13 +365,6 @@ $result_nodes{'menu_pointing_to_anchor'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'anchor',
-    'extra' => {
-      'normalized' => 'An-anchor'
-    },
-    'node_prev' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -384,10 +380,21 @@ $result_nodes{'menu_pointing_to_anchor'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'anchor',
+      'extra' => {
+        'normalized' => 'An-anchor'
+      },
+      'structure' => {
+        'node_prev' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'menu_pointing_to_anchor'}{'menu_child'}{'node_prev'} = 
$result_nodes{'menu_pointing_to_anchor'};
-$result_nodes{'menu_pointing_to_anchor'}{'node_next'} = 
$result_nodes{'menu_pointing_to_anchor'}{'menu_child'};
+$result_nodes{'menu_pointing_to_anchor'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'menu_pointing_to_anchor'};
+$result_nodes{'menu_pointing_to_anchor'}{'structure'}{'node_next'} = 
$result_nodes{'menu_pointing_to_anchor'}{'structure'}{'menu_child'};
 
 $result_menus{'menu_pointing_to_anchor'} = {
   'cmdname' => 'node',
@@ -395,18 +402,22 @@ $result_menus{'menu_pointing_to_anchor'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'anchor',
-    'extra' => {
-      'normalized' => 'An-anchor'
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'anchor',
+      'extra' => {
+        'normalized' => 'An-anchor'
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'menu_pointing_to_anchor'}{'menu_child'}{'menu_up'} = 
$result_menus{'menu_pointing_to_anchor'};
+$result_menus{'menu_pointing_to_anchor'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'menu_pointing_to_anchor'};
 
 $result_errors{'menu_pointing_to_anchor'} = [];
 
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index 2f6405051d..d140de3728 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -191,7 +191,8 @@ $result_trees{'menu_title_before_entries'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -232,7 +233,8 @@ $result_trees{'menu_title_before_entries'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -294,15 +296,6 @@ $result_nodes{'menu_title_before_entries'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'subnode',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -318,11 +311,24 @@ $result_nodes{'menu_title_before_entries'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'subnode',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'menu_title_before_entries'}{'menu_child'}{'node_prev'} = 
$result_nodes{'menu_title_before_entries'};
-$result_nodes{'menu_title_before_entries'}{'menu_child'}{'node_up'} = 
$result_nodes{'menu_title_before_entries'};
-$result_nodes{'menu_title_before_entries'}{'node_next'} = 
$result_nodes{'menu_title_before_entries'}{'menu_child'};
+$result_nodes{'menu_title_before_entries'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'menu_title_before_entries'};
+$result_nodes{'menu_title_before_entries'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'menu_title_before_entries'};
+$result_nodes{'menu_title_before_entries'}{'structure'}{'node_next'} = 
$result_nodes{'menu_title_before_entries'}{'structure'}{'menu_child'};
 
 $result_menus{'menu_title_before_entries'} = {
   'cmdname' => 'node',
@@ -330,19 +336,23 @@ $result_menus{'menu_title_before_entries'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'subnode',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'subnode',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'menu_title_before_entries'}{'menu_child'}{'menu_up'} = 
$result_menus{'menu_title_before_entries'};
+$result_menus{'menu_title_before_entries'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'menu_title_before_entries'};
 
 $result_errors{'menu_title_before_entries'} = [];
 
diff --git a/tp/t/results/menu/multiple_menus.pl 
b/tp/t/results/menu/multiple_menus.pl
index 92a1e71a40..0e8cd6ebf8 100644
--- a/tp/t/results/menu/multiple_menus.pl
+++ b/tp/t/results/menu/multiple_menus.pl
@@ -314,7 +314,8 @@ $result_trees{'multiple_menus'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -394,16 +395,6 @@ $result_nodes{'multiple_menus'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'b'
-        }
-      ],
-      'normalized' => 'b'
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -432,9 +423,21 @@ $result_nodes{'multiple_menus'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'b'
+          }
+        ],
+        'normalized' => 'b'
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'multiple_menus'}{'node_next'} = 
$result_nodes{'multiple_menus'}{'menu_child'};
+$result_nodes{'multiple_menus'}{'structure'}{'node_next'} = 
$result_nodes{'multiple_menus'}{'structure'}{'menu_child'};
 
 $result_menus{'multiple_menus'} = {
   'cmdname' => 'node',
@@ -442,14 +445,16 @@ $result_menus{'multiple_menus'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'b'
-        }
-      ],
-      'normalized' => 'b'
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'b'
+          }
+        ],
+        'normalized' => 'b'
+      }
     }
   }
 };
diff --git a/tp/t/results/menu/no_colon_in_menu.pl 
b/tp/t/results/menu/no_colon_in_menu.pl
index 0675217fba..c64ffecef0 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -128,7 +128,8 @@ $result_trees{'no_colon_in_menu'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -183,7 +184,8 @@ $result_nodes{'no_colon_in_menu'} = {
         }
       }
     }
-  ]
+  ],
+  'structure' => {}
 };
 
 $result_menus{'no_colon_in_menu'} = {
@@ -191,7 +193,8 @@ $result_menus{'no_colon_in_menu'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'no_colon_in_menu'} = [];
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index 8e56ca7a2f..39508955a8 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -182,7 +182,8 @@ $result_trees{'reference_to_external_manual'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -235,15 +236,6 @@ $result_nodes{'reference_to_external_manual'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'info'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -259,9 +251,20 @@ $result_nodes{'reference_to_external_manual'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'info'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'reference_to_external_manual'}{'node_next'} = 
$result_nodes{'reference_to_external_manual'}{'menu_child'};
+$result_nodes{'reference_to_external_manual'}{'structure'}{'node_next'} = 
$result_nodes{'reference_to_external_manual'}{'structure'}{'menu_child'};
 
 $result_menus{'reference_to_external_manual'} = {
   'cmdname' => 'node',
@@ -269,13 +272,15 @@ $result_menus{'reference_to_external_manual'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'info'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'info'
+          }
+        ]
+      }
     }
   }
 };
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index 8cc7cfd04b..af8ab18b66 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -481,7 +481,8 @@ $result_trees{'sc_in_menu'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -850,7 +851,8 @@ $result_trees{'sc_in_menu'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -1033,15 +1035,6 @@ $result_nodes{'sc_in_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'NODE',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1057,11 +1050,24 @@ $result_nodes{'sc_in_menu'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'NODE',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'sc_in_menu'}{'menu_child'}{'node_prev'} = 
$result_nodes{'sc_in_menu'};
-$result_nodes{'sc_in_menu'}{'menu_child'}{'node_up'} = 
$result_nodes{'sc_in_menu'};
-$result_nodes{'sc_in_menu'}{'node_next'} = 
$result_nodes{'sc_in_menu'}{'menu_child'};
+$result_nodes{'sc_in_menu'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'sc_in_menu'};
+$result_nodes{'sc_in_menu'}{'structure'}{'menu_child'}{'structure'}{'node_up'} 
= $result_nodes{'sc_in_menu'};
+$result_nodes{'sc_in_menu'}{'structure'}{'node_next'} = 
$result_nodes{'sc_in_menu'}{'structure'}{'menu_child'};
 
 $result_menus{'sc_in_menu'} = {
   'cmdname' => 'node',
@@ -1069,19 +1075,23 @@ $result_menus{'sc_in_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'NODE',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'NODE',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'sc_in_menu'}{'menu_child'}{'menu_up'} = 
$result_menus{'sc_in_menu'};
+$result_menus{'sc_in_menu'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} 
= $result_menus{'sc_in_menu'};
 
 $result_errors{'sc_in_menu'} = [
   {
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index 5b8a8d584a..fbfb113c15 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -643,7 +643,8 @@ $result_trees{'submenu_in_example'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -794,7 +795,8 @@ $result_nodes{'submenu_in_example'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'submenu_in_example'} = {
@@ -802,7 +804,8 @@ $result_menus{'submenu_in_example'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'submenu_in_example'} = [
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index b5f2fbfe28..2f6c564df0 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -51,7 +51,8 @@ $result_trees{'verb_in_menu_description'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -341,7 +342,8 @@ $result_sectioning{'verb_in_menu_description'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -370,15 +372,6 @@ $result_nodes{'verb_in_menu_description'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'manual'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -394,9 +387,20 @@ $result_nodes{'verb_in_menu_description'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'manual'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'verb_in_menu_description'}{'node_next'} = 
$result_nodes{'verb_in_menu_description'}{'menu_child'};
+$result_nodes{'verb_in_menu_description'}{'structure'}{'node_next'} = 
$result_nodes{'verb_in_menu_description'}{'structure'}{'menu_child'};
 
 $result_menus{'verb_in_menu_description'} = {
   'cmdname' => 'node',
@@ -404,13 +408,15 @@ $result_menus{'verb_in_menu_description'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'manual'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'manual'
+          }
+        ]
+      }
     }
   }
 };
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 3b4474aa08..4be6dc2e61 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -1648,7 +1648,8 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
         'line_nr' => 39,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5124,7 +5125,8 @@ 
$result_sectioning{'codequoteundirected_codequotebacktick'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -5152,7 +5154,8 @@ $result_nodes{'codequoteundirected_codequotebacktick'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'codequoteundirected_codequotebacktick'} = {
@@ -5160,7 +5163,8 @@ $result_menus{'codequoteundirected_codequotebacktick'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'codequoteundirected_codequotebacktick'} = [
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index 2b4e854c4a..d45a5782c8 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -124,7 +124,8 @@ $result_trees{'comment_space_command_on_line'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -747,7 +748,8 @@ $result_sectioning{'comment_space_command_on_line'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -776,7 +778,8 @@ $result_nodes{'comment_space_command_on_line'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'comment_space_command_on_line'} = {
@@ -785,7 +788,8 @@ $result_menus{'comment_space_command_on_line'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'comment_space_command_on_line'} = [];
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index 30636d2c40..2a969299f4 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -192,7 +192,8 @@ $result_trees{'ref_in_center'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -244,7 +245,8 @@ $result_nodes{'ref_in_center'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'ref_in_center'} = {
@@ -252,7 +254,8 @@ $result_menus{'ref_in_center'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'ref_in_center'} = [
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 9ac4a4ab87..f35a8f5d4c 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2234,7 +2234,8 @@ $result_trees{'test_allowcodebreaks'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -2691,7 +2692,8 @@ $result_nodes{'test_allowcodebreaks'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'test_allowcodebreaks'} = {
@@ -2699,7 +2701,8 @@ $result_menus{'test_allowcodebreaks'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'test_allowcodebreaks'} = [];
diff --git a/tp/t/results/misc_commands/text_before_line_command.pl 
b/tp/t/results/misc_commands/text_before_line_command.pl
index f5e3e095c3..5c9fc82e1f 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -117,7 +117,8 @@ $result_trees{'text_before_line_command'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -370,7 +371,8 @@ $result_sectioning{'text_before_line_command'} = {
             'extra' => {
               'normalized' => 'LD-Version-Scripts',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -400,7 +402,8 @@ $result_nodes{'text_before_line_command'} = {
     },
     'normalized' => 'LD-Version-Scripts',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'text_before_line_command'} = {
@@ -408,7 +411,8 @@ $result_menus{'text_before_line_command'} = {
   'extra' => {
     'normalized' => 'LD-Version-Scripts',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'text_before_line_command'} = [
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 0a5a123910..fa00539b9b 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -568,7 +568,8 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2134,7 +2135,8 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 84,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2540,7 +2542,8 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 99,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2945,7 +2948,8 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 113,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3239,7 +3243,8 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 123,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3320,7 +3325,8 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 126,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3402,7 +3408,8 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 129,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4318,7 +4325,8 @@ $result_sectioning{'formatting_fr'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -4333,7 +4341,8 @@ $result_sectioning{'formatting_fr'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -4349,7 +4358,8 @@ $result_sectioning{'formatting_fr'} = {
                         'extra' => {
                           'normalized' => 's_002d_002dect_002cion',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -4365,7 +4375,8 @@ $result_sectioning{'formatting_fr'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -4381,7 +4392,8 @@ $result_sectioning{'formatting_fr'} = {
                                     'extra' => {
                                       'normalized' => 
'subsubsection-_0060_0060simple_002ddouble_002d_002d',
                                       'spaces_before_argument' => ' '
-                                    }
+                                    },
+                                    'structure' => {}
                                   },
                                   'spaces_before_argument' => ' '
                                 },
@@ -4399,7 +4411,8 @@ $result_sectioning{'formatting_fr'} = {
                                     'extra' => {
                                       'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027',
                                       'spaces_before_argument' => ' '
-                                    }
+                                    },
+                                    'structure' => {}
                                   },
                                   'spaces_before_argument' => ' '
                                 },
@@ -4433,7 +4446,8 @@ $result_sectioning{'formatting_fr'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -4482,44 +4496,6 @@ $result_nodes{'formatting_fr'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'centerchap',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 1
-          }
-        },
-        'isindex' => 1,
-        'normalized' => 'chapter2',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -4535,13 +4511,57 @@ $result_nodes{'formatting_fr'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'centerchap',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1
+              }
+            },
+            'isindex' => 1,
+            'normalized' => 'chapter2',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'formatting_fr'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'formatting_fr'}{'menu_child'};
-$result_nodes{'formatting_fr'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'formatting_fr'};
-$result_nodes{'formatting_fr'}{'menu_child'}{'node_prev'} = 
$result_nodes{'formatting_fr'};
-$result_nodes{'formatting_fr'}{'menu_child'}{'node_up'} = 
$result_nodes{'formatting_fr'};
-$result_nodes{'formatting_fr'}{'node_next'} = 
$result_nodes{'formatting_fr'}{'menu_child'};
+$result_nodes{'formatting_fr'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'formatting_fr'}{'structure'}{'menu_child'};
+$result_nodes{'formatting_fr'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'formatting_fr'};
+$result_nodes{'formatting_fr'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'formatting_fr'};
+$result_nodes{'formatting_fr'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'formatting_fr'};
+$result_nodes{'formatting_fr'}{'structure'}{'node_next'} = 
$result_nodes{'formatting_fr'}{'structure'}{'menu_child'};
 
 $result_menus{'formatting_fr'} = {
   'cmdname' => 'node',
@@ -4550,34 +4570,40 @@ $result_menus{'formatting_fr'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'isindex' => 1,
-        'normalized' => 'chapter2',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 'chapter2',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'formatting_fr'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'formatting_fr'}{'menu_child'};
-$result_menus{'formatting_fr'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'formatting_fr'};
-$result_menus{'formatting_fr'}{'menu_child'}{'menu_up'} = 
$result_menus{'formatting_fr'};
+$result_menus{'formatting_fr'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'formatting_fr'}{'structure'}{'menu_child'};
+$result_menus{'formatting_fr'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'formatting_fr'};
+$result_menus{'formatting_fr'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'formatting_fr'};
 
 $result_errors{'formatting_fr'} = [
   {
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index 83c5b36e50..ccf3e21865 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -568,7 +568,8 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2134,7 +2135,8 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 84,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2540,7 +2542,8 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 99,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2945,7 +2948,8 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 113,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3239,7 +3243,8 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 123,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3320,7 +3325,8 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 126,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3402,7 +3408,8 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 129,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4318,7 +4325,8 @@ $result_sectioning{'texi_formatting'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -4333,7 +4341,8 @@ $result_sectioning{'texi_formatting'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -4349,7 +4358,8 @@ $result_sectioning{'texi_formatting'} = {
                         'extra' => {
                           'normalized' => 's_002d_002dect_002cion',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -4365,7 +4375,8 @@ $result_sectioning{'texi_formatting'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -4381,7 +4392,8 @@ $result_sectioning{'texi_formatting'} = {
                                     'extra' => {
                                       'normalized' => 
'subsubsection-_0060_0060simple_002ddouble_002d_002d',
                                       'spaces_before_argument' => ' '
-                                    }
+                                    },
+                                    'structure' => {}
                                   },
                                   'spaces_before_argument' => ' '
                                 },
@@ -4399,7 +4411,8 @@ $result_sectioning{'texi_formatting'} = {
                                     'extra' => {
                                       'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027',
                                       'spaces_before_argument' => ' '
-                                    }
+                                    },
+                                    'structure' => {}
                                   },
                                   'spaces_before_argument' => ' '
                                 },
@@ -4433,7 +4446,8 @@ $result_sectioning{'texi_formatting'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -4482,44 +4496,6 @@ $result_nodes{'texi_formatting'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'centerchap',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 1
-          }
-        },
-        'isindex' => 1,
-        'normalized' => 'chapter2',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -4535,13 +4511,57 @@ $result_nodes{'texi_formatting'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'centerchap',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1
+              }
+            },
+            'isindex' => 1,
+            'normalized' => 'chapter2',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'texi_formatting'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'texi_formatting'}{'menu_child'};
-$result_nodes{'texi_formatting'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'texi_formatting'};
-$result_nodes{'texi_formatting'}{'menu_child'}{'node_prev'} = 
$result_nodes{'texi_formatting'};
-$result_nodes{'texi_formatting'}{'menu_child'}{'node_up'} = 
$result_nodes{'texi_formatting'};
-$result_nodes{'texi_formatting'}{'node_next'} = 
$result_nodes{'texi_formatting'}{'menu_child'};
+$result_nodes{'texi_formatting'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'texi_formatting'}{'structure'}{'menu_child'};
+$result_nodes{'texi_formatting'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'texi_formatting'};
+$result_nodes{'texi_formatting'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'texi_formatting'};
+$result_nodes{'texi_formatting'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'texi_formatting'};
+$result_nodes{'texi_formatting'}{'structure'}{'node_next'} = 
$result_nodes{'texi_formatting'}{'structure'}{'menu_child'};
 
 $result_menus{'texi_formatting'} = {
   'cmdname' => 'node',
@@ -4550,34 +4570,40 @@ $result_menus{'texi_formatting'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'isindex' => 1,
-        'normalized' => 'chapter2',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 'chapter2',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'texi_formatting'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'texi_formatting'}{'menu_child'};
-$result_menus{'texi_formatting'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'texi_formatting'};
-$result_menus{'texi_formatting'}{'menu_child'}{'menu_up'} = 
$result_menus{'texi_formatting'};
+$result_menus{'texi_formatting'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'texi_formatting'}{'structure'}{'menu_child'};
+$result_menus{'texi_formatting'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'texi_formatting'};
+$result_menus{'texi_formatting'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'texi_formatting'};
 
 $result_errors{'texi_formatting'} = [
   {
diff --git a/tp/t/results/moreindices/double_index_entry.pl 
b/tp/t/results/moreindices/double_index_entry.pl
index 22b09ce491..2d320be548 100644
--- a/tp/t/results/moreindices/double_index_entry.pl
+++ b/tp/t/results/moreindices/double_index_entry.pl
@@ -298,7 +298,8 @@ $result_trees{'double_index_entry'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -459,7 +460,8 @@ $result_trees{'double_index_entry'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -574,16 +576,6 @@ $result_nodes{'double_index_entry'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'other-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -599,11 +591,25 @@ $result_nodes{'double_index_entry'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'other-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'double_index_entry'}{'menu_child'}{'node_prev'} = 
$result_nodes{'double_index_entry'};
-$result_nodes{'double_index_entry'}{'menu_child'}{'node_up'} = 
$result_nodes{'double_index_entry'};
-$result_nodes{'double_index_entry'}{'node_next'} = 
$result_nodes{'double_index_entry'}{'menu_child'};
+$result_nodes{'double_index_entry'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'double_index_entry'};
+$result_nodes{'double_index_entry'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'double_index_entry'};
+$result_nodes{'double_index_entry'}{'structure'}{'node_next'} = 
$result_nodes{'double_index_entry'}{'structure'}{'menu_child'};
 
 $result_menus{'double_index_entry'} = {
   'cmdname' => 'node',
@@ -611,20 +617,24 @@ $result_menus{'double_index_entry'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'other-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'isindex' => 1,
+        'normalized' => 'other-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'double_index_entry'}{'menu_child'}{'menu_up'} = 
$result_menus{'double_index_entry'};
+$result_menus{'double_index_entry'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'double_index_entry'};
 
 $result_errors{'double_index_entry'} = [];
 
diff --git a/tp/t/results/moreindices/index_split.pl 
b/tp/t/results/moreindices/index_split.pl
index e55f38edfb..31c3192adb 100644
--- a/tp/t/results/moreindices/index_split.pl
+++ b/tp/t/results/moreindices/index_split.pl
@@ -112,7 +112,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -901,7 +902,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1507,7 +1509,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 51,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1903,7 +1906,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 66,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2002,7 +2006,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 71,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2231,7 +2236,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 82,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2330,7 +2336,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 87,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2598,7 +2605,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 94,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2901,7 +2909,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 99,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3024,7 +3033,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 112,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3065,7 +3075,8 @@ $result_trees{'index_split'} = {
         'line_nr' => 116,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3819,7 +3830,8 @@ $result_sectioning{'index_split'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3835,7 +3847,8 @@ $result_sectioning{'index_split'} = {
                     'isindex' => 1,
                     'normalized' => 'first',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3852,7 +3865,8 @@ $result_sectioning{'index_split'} = {
                           'isindex' => 1,
                           'normalized' => 'section-1',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3868,7 +3882,8 @@ $result_sectioning{'index_split'} = {
                               'extra' => {
                                 'normalized' => 'subsection-1',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3887,7 +3902,8 @@ $result_sectioning{'index_split'} = {
                                 'isindex' => 1,
                                 'normalized' => 'subsection-2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3910,7 +3926,8 @@ $result_sectioning{'index_split'} = {
                         'extra' => {
                           'normalized' => 'section-2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3930,7 +3947,8 @@ $result_sectioning{'index_split'} = {
                           'isindex' => 1,
                           'normalized' => 'section-3',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3955,7 +3973,8 @@ $result_sectioning{'index_split'} = {
                   'extra' => {
                     'normalized' => 'second-chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -4008,7 +4027,6 @@ $result_nodes{'index_split'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {},
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -4024,78 +4042,25 @@ $result_nodes{'index_split'} = {
       }
     }
   ],
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
+  'structure' => {
+    'menu_child' => {},
+    'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'section-1',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection-1',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'associated_section' => {
-              'cmdname' => 'subsection',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
-              'structure' => {
-                'level' => 3,
-                'number' => '1.1.2'
-              }
-            },
-            'isindex' => 1,
-            'normalized' => 'subsection-2',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -4111,23 +4076,8 @@ $result_nodes{'index_split'} = {
           }
         }
       ],
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2,
-              'number' => '1.2'
-            }
-          },
-          'normalized' => 'section-2',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
@@ -4137,83 +4087,170 @@ $result_nodes{'index_split'} = {
               },
               'structure' => {
                 'level' => 2,
-                'number' => '1.3'
+                'number' => '1.1'
               }
             },
             'isindex' => 1,
-            'normalized' => 'section-3',
+            'normalized' => 'section-1',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'node-in-section-3',
-              'spaces_before_argument' => ' '
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection-1',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'subsection',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 3,
+                        'number' => '1.1.2'
+                      }
+                    },
+                    'isindex' => 1,
+                    'normalized' => 'subsection-2',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
+              }
+            },
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'section',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2,
+                    'number' => '1.2'
+                  }
+                },
+                'normalized' => 'section-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'section',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 2,
+                        'number' => '1.3'
+                      }
+                    },
+                    'isindex' => 1,
+                    'normalized' => 'section-3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'node-in-section-3',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
             },
-            'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
           }
-        }
-      }
-    ],
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
+        },
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'second-chapter',
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 1,
-            'number' => 2
+            'node_prev' => {},
+            'node_up' => {}
           }
         },
-        'normalized' => 'second-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'index_split'}{'menu_child'} = $result_nodes{'index_split'};
-$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'index_split'}{'node_next'}{'menu_child'}{'menu_child'};
-$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'index_split'}{'node_next'}{'menu_child'};
-$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'index_split'}{'node_next'}{'menu_child'};
-$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'index_split'}{'node_next'};
-$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'index_split'}{'node_next'}{'menu_child'}{'node_next'};
-$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'index_split'}{'node_next'};
-$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'index_split'}{'node_next'}{'menu_child'};
-$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'index_split'}{'node_next'};
-$result_nodes{'index_split'}{'node_next'}{'menu_child'}{'node_up'} = 
$result_nodes{'index_split'}{'node_next'};
-$result_nodes{'index_split'}{'node_next'}{'node_next'}{'node_prev'} = 
$result_nodes{'index_split'}{'node_next'};
-$result_nodes{'index_split'}{'node_next'}{'node_next'}{'node_up'} = 
$result_nodes{'index_split'};
-$result_nodes{'index_split'}{'node_next'}{'node_prev'} = 
$result_nodes{'index_split'};
-$result_nodes{'index_split'}{'node_next'}{'node_up'} = 
$result_nodes{'index_split'};
+$result_nodes{'index_split'}{'structure'}{'menu_child'} = 
$result_nodes{'index_split'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_split'}{'structure'}{'node_next'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_split'}{'structure'}{'node_next'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_split'}{'structure'}{'node_next'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'index_split'}{'structure'}{'node_next'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'index_split'}{'structure'}{'node_next'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_split'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'index_split'};
+$result_nodes{'index_split'}{'structure'}{'node_next'}{'structure'}{'node_up'} 
= $result_nodes{'index_split'};
 
 $result_menus{'index_split'} = {
   'cmdname' => 'node',
@@ -4222,155 +4259,177 @@ $result_menus{'index_split'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {},
-  'menu_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
+  'structure' => {
+    'menu_child' => {},
+    'menu_next' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'section-1',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection-1',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'isindex' => 1,
-            'normalized' => 'subsection-2',
-            'spaces_before_argument' => ' '
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'section-1' => 1
-          }
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'section-1' => 1
-        }
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'section-2',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'section-3',
+            'normalized' => 'section-1',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'node-in-section-3',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection-1',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'isindex' => 1,
+                    'normalized' => 'subsection-2',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'section-1' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section-1' => 1
+                }
+              }
             },
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'isindex' => 1,
-                'normalized' => 'node-2-in-section-3',
+                'normalized' => 'section-2',
                 'spaces_before_argument' => ' '
               },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'node-3-in-section-3',
-                  'spaces_before_argument' => ' '
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'isindex' => 1,
+                    'normalized' => 'section-3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'node-in-section-3',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'isindex' => 1,
+                            'normalized' => 'node-2-in-section-3',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'normalized' => 'node-3-in-section-3',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'menu_prev' => {},
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'first' => 1
+                                }
+                              }
+                            },
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'first' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'first' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'first' => 1
+                    }
+                  }
                 },
                 'menu_prev' => {},
                 'menu_up' => {},
                 'menu_up_hash' => {
                   'first' => 1
                 }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'first' => 1
               }
             },
-            'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
               'first' => 1
             }
+          }
+        },
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'second-chapter',
+            'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'first' => 1
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
         'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'first' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'first' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'second-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
     },
-    'menu_prev' => {},
     'menu_up' => {},
     'menu_up_hash' => {
       'Top' => 1
     }
-  },
-  'menu_up' => {},
-  'menu_up_hash' => {
-    'Top' => 1
   }
 };
-$result_menus{'index_split'}{'menu_child'} = $result_menus{'index_split'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_child'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split'}{'menu_next'}{'menu_child'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'index_split'}{'menu_next'}{'menu_child'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'index_split'}{'menu_next'}{'menu_child'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_child'}{'menu_up'} = 
$result_menus{'index_split'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_next'}{'menu_prev'} = 
$result_menus{'index_split'}{'menu_next'};
-$result_menus{'index_split'}{'menu_next'}{'menu_next'}{'menu_up'} = 
$result_menus{'index_split'};
-$result_menus{'index_split'}{'menu_next'}{'menu_prev'} = 
$result_menus{'index_split'};
-$result_menus{'index_split'}{'menu_next'}{'menu_up'} = 
$result_menus{'index_split'};
-$result_menus{'index_split'}{'menu_up'} = $result_menus{'index_split'};
+$result_menus{'index_split'}{'structure'}{'menu_child'} = 
$result_menus{'index_split'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'index_split'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'index_split'}{'structure'}{'menu_next'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'index_split'};
+$result_menus{'index_split'}{'structure'}{'menu_next'}{'structure'}{'menu_up'} 
= $result_menus{'index_split'};
+$result_menus{'index_split'}{'structure'}{'menu_up'} = 
$result_menus{'index_split'};
 
 $result_errors{'index_split'} = [
   {
diff --git a/tp/t/results/moreindices/index_split_nodes.pl 
b/tp/t/results/moreindices/index_split_nodes.pl
index 1ffe6a75fe..e120d60059 100644
--- a/tp/t/results/moreindices/index_split_nodes.pl
+++ b/tp/t/results/moreindices/index_split_nodes.pl
@@ -112,7 +112,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -901,7 +902,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1507,7 +1509,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 51,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1903,7 +1906,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 66,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2002,7 +2006,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 71,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2231,7 +2236,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 82,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2330,7 +2336,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 87,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2598,7 +2605,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 94,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2901,7 +2909,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 99,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3024,7 +3033,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 112,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3065,7 +3075,8 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 116,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3819,7 +3830,8 @@ $result_sectioning{'index_split_nodes'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3835,7 +3847,8 @@ $result_sectioning{'index_split_nodes'} = {
                     'isindex' => 1,
                     'normalized' => 'first',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3852,7 +3865,8 @@ $result_sectioning{'index_split_nodes'} = {
                           'isindex' => 1,
                           'normalized' => 'section-1',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3868,7 +3882,8 @@ $result_sectioning{'index_split_nodes'} = {
                               'extra' => {
                                 'normalized' => 'subsection-1',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3887,7 +3902,8 @@ $result_sectioning{'index_split_nodes'} = {
                                 'isindex' => 1,
                                 'normalized' => 'subsection-2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3910,7 +3926,8 @@ $result_sectioning{'index_split_nodes'} = {
                         'extra' => {
                           'normalized' => 'section-2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3930,7 +3947,8 @@ $result_sectioning{'index_split_nodes'} = {
                           'isindex' => 1,
                           'normalized' => 'section-3',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3955,7 +3973,8 @@ $result_sectioning{'index_split_nodes'} = {
                   'extra' => {
                     'normalized' => 'second-chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -4008,7 +4027,6 @@ $result_nodes{'index_split_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {},
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -4024,78 +4042,25 @@ $result_nodes{'index_split_nodes'} = {
       }
     }
   ],
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
+  'structure' => {
+    'menu_child' => {},
+    'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'section-1',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection-1',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'associated_section' => {
-              'cmdname' => 'subsection',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
-              'structure' => {
-                'level' => 3,
-                'number' => '1.1.2'
-              }
-            },
-            'isindex' => 1,
-            'normalized' => 'subsection-2',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -4111,23 +4076,8 @@ $result_nodes{'index_split_nodes'} = {
           }
         }
       ],
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2,
-              'number' => '1.2'
-            }
-          },
-          'normalized' => 'section-2',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
@@ -4137,83 +4087,170 @@ $result_nodes{'index_split_nodes'} = {
               },
               'structure' => {
                 'level' => 2,
-                'number' => '1.3'
+                'number' => '1.1'
               }
             },
             'isindex' => 1,
-            'normalized' => 'section-3',
+            'normalized' => 'section-1',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'node-in-section-3',
-              'spaces_before_argument' => ' '
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection-1',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'subsection',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 3,
+                        'number' => '1.1.2'
+                      }
+                    },
+                    'isindex' => 1,
+                    'normalized' => 'subsection-2',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
+              }
+            },
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'section',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2,
+                    'number' => '1.2'
+                  }
+                },
+                'normalized' => 'section-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'section',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 2,
+                        'number' => '1.3'
+                      }
+                    },
+                    'isindex' => 1,
+                    'normalized' => 'section-3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'node-in-section-3',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
             },
-            'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
           }
-        }
-      }
-    ],
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
+        },
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'second-chapter',
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 1,
-            'number' => 2
+            'node_prev' => {},
+            'node_up' => {}
           }
         },
-        'normalized' => 'second-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'index_split_nodes'}{'menu_child'} = 
$result_nodes{'index_split_nodes'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'menu_child'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'index_split_nodes'}{'node_next'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'node_next'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'index_split_nodes'}{'node_next'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'index_split_nodes'}{'node_next'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'menu_child'}{'node_up'} = 
$result_nodes{'index_split_nodes'}{'node_next'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'node_next'}{'node_prev'} = 
$result_nodes{'index_split_nodes'}{'node_next'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'node_next'}{'node_up'} = 
$result_nodes{'index_split_nodes'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'node_prev'} = 
$result_nodes{'index_split_nodes'};
-$result_nodes{'index_split_nodes'}{'node_next'}{'node_up'} = 
$result_nodes{'index_split_nodes'};
+$result_nodes{'index_split_nodes'}{'structure'}{'menu_child'} = 
$result_nodes{'index_split_nodes'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_split_nodes'}{'structure'}{'node_next'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_split_nodes'}{'structure'}{'node_next'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_split_nodes'}{'structure'}{'node_next'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'index_split_nodes'}{'structure'}{'node_next'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'index_split_nodes'}{'structure'}{'node_next'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_split_nodes'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'index_split_nodes'};
+$result_nodes{'index_split_nodes'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'index_split_nodes'};
 
 $result_menus{'index_split_nodes'} = {
   'cmdname' => 'node',
@@ -4222,155 +4259,177 @@ $result_menus{'index_split_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {},
-  'menu_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
+  'structure' => {
+    'menu_child' => {},
+    'menu_next' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'section-1',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection-1',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'isindex' => 1,
-            'normalized' => 'subsection-2',
-            'spaces_before_argument' => ' '
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'section-1' => 1
-          }
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'section-1' => 1
-        }
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'section-2',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'section-3',
+            'normalized' => 'section-1',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'node-in-section-3',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection-1',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'isindex' => 1,
+                    'normalized' => 'subsection-2',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'section-1' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section-1' => 1
+                }
+              }
             },
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'isindex' => 1,
-                'normalized' => 'node-2-in-section-3',
+                'normalized' => 'section-2',
                 'spaces_before_argument' => ' '
               },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'node-3-in-section-3',
-                  'spaces_before_argument' => ' '
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'isindex' => 1,
+                    'normalized' => 'section-3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'node-in-section-3',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'isindex' => 1,
+                            'normalized' => 'node-2-in-section-3',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'normalized' => 'node-3-in-section-3',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'menu_prev' => {},
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'first' => 1
+                                }
+                              }
+                            },
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'first' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'first' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'first' => 1
+                    }
+                  }
                 },
                 'menu_prev' => {},
                 'menu_up' => {},
                 'menu_up_hash' => {
                   'first' => 1
                 }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'first' => 1
               }
             },
-            'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
               'first' => 1
             }
+          }
+        },
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'second-chapter',
+            'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'first' => 1
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
         'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'first' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'first' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'second-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
     },
-    'menu_prev' => {},
     'menu_up' => {},
     'menu_up_hash' => {
       'Top' => 1
     }
-  },
-  'menu_up' => {},
-  'menu_up_hash' => {
-    'Top' => 1
   }
 };
-$result_menus{'index_split_nodes'}{'menu_child'} = 
$result_menus{'index_split_nodes'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_child'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_child'}{'menu_up'} = 
$result_menus{'index_split_nodes'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_next'}{'menu_prev'} = 
$result_menus{'index_split_nodes'}{'menu_next'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_next'}{'menu_up'} = 
$result_menus{'index_split_nodes'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_prev'} = 
$result_menus{'index_split_nodes'};
-$result_menus{'index_split_nodes'}{'menu_next'}{'menu_up'} = 
$result_menus{'index_split_nodes'};
-$result_menus{'index_split_nodes'}{'menu_up'} = 
$result_menus{'index_split_nodes'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_child'} = 
$result_menus{'index_split_nodes'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'index_split_nodes'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'index_split_nodes'}{'structure'}{'menu_next'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split_nodes'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'index_split_nodes'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'index_split_nodes'};
+$result_menus{'index_split_nodes'}{'structure'}{'menu_up'} = 
$result_menus{'index_split_nodes'};
 
 $result_errors{'index_split_nodes'} = [];
 
diff --git a/tp/t/results/moreindices/nodes_before_top.pl 
b/tp/t/results/moreindices/nodes_before_top.pl
index 4c71b8c2f9..6cd18a2991 100644
--- a/tp/t/results/moreindices/nodes_before_top.pl
+++ b/tp/t/results/moreindices/nodes_before_top.pl
@@ -369,7 +369,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -588,7 +589,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -947,7 +949,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1322,7 +1325,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1603,7 +1607,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 50,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1825,7 +1830,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 58,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2121,7 +2127,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 64,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2575,38 +2582,29 @@ $result_nodes{'nodes_before_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
+        }
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'second',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'isindex' => 1,
-          'normalized' => 'a-node',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'another',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -2622,92 +2620,115 @@ $result_nodes{'nodes_before_top'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'isindex' => 1,
+            'normalized' => 'second',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'isindex' => 1,
+                'normalized' => 'a-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'another',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_prev' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first-before-top',
-      'spaces_before_argument' => ' '
     },
-    'menu_child' => {
+    'node_prev' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'node-in-menu-before-top',
+        'normalized' => 'first-before-top',
         'spaces_before_argument' => ' '
       },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
           }
         }
-      }
-    ],
-    'node_next' => {},
-    'node_up' => {
-      'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'dir'
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 'node-in-menu-before-top',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_up' => {}
           }
-        ]
+        },
+        'node_next' => {},
+        'node_up' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'dir'
+              }
+            ]
+          }
+        }
       }
     }
   }
 };
-$result_nodes{'nodes_before_top'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'nodes_before_top'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_before_top'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_before_top'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'nodes_before_top'}{'menu_child'};
-$result_nodes{'nodes_before_top'}{'menu_child'}{'node_prev'} = 
$result_nodes{'nodes_before_top'};
-$result_nodes{'nodes_before_top'}{'menu_child'}{'node_up'} = 
$result_nodes{'nodes_before_top'};
-$result_nodes{'nodes_before_top'}{'node_prev'}{'menu_child'}{'node_up'} = 
$result_nodes{'nodes_before_top'}{'node_prev'};
-$result_nodes{'nodes_before_top'}{'node_prev'}{'node_next'} = 
$result_nodes{'nodes_before_top'};
+$result_nodes{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_before_top'};
+$result_nodes{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top'};
+$result_nodes{'nodes_before_top'}{'structure'}{'node_prev'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top'}{'structure'}{'node_prev'};
+$result_nodes{'nodes_before_top'}{'structure'}{'node_prev'}{'structure'}{'node_next'}
 = $result_nodes{'nodes_before_top'};
 
 $result_menus{'nodes_before_top'} = {
   'cmdname' => 'node',
@@ -2716,60 +2737,70 @@ $result_menus{'nodes_before_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'second',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'isindex' => 1,
-          'normalized' => 'a-node',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'another',
+            'isindex' => 1,
+            'normalized' => 'second',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'second' => 1
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'isindex' => 1,
+                'normalized' => 'a-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'another',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'second' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'second' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'first' => 1
+            }
           }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'second' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'first' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_before_top'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'nodes_before_top'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_before_top'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_before_top'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'nodes_before_top'}{'menu_child'};
-$result_menus{'nodes_before_top'}{'menu_child'}{'menu_up'} = 
$result_menus{'nodes_before_top'};
+$result_menus{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_before_top'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_before_top'};
 
 $result_errors{'nodes_before_top'} = [];
 
diff --git 
a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl 
b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
index 717f597240..daeb1337ea 100644
--- a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
+++ b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
@@ -428,7 +428,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -658,7 +659,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
         'line_nr' => 18,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -906,7 +908,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
         'line_nr' => 28,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1608,7 +1611,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
         'line_nr' => 50,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1889,7 +1893,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
         'line_nr' => 62,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2111,7 +2116,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
         'line_nr' => 70,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2407,7 +2413,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
         'line_nr' => 76,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2487,7 +2494,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
         'line_nr' => 86,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2700,7 +2708,8 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
         'line_nr' => 91,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3284,7 +3293,8 @@ 
$result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
               'isindex' => 1,
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3300,7 +3310,8 @@ 
$result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
                     'isindex' => 1,
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3340,38 +3351,29 @@ 
$result_nodes{'nodes_before_top_and_sections_monolithic'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
+        }
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'second',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'isindex' => 1,
-          'normalized' => 'a-node',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'another',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -3387,92 +3389,115 @@ 
$result_nodes{'nodes_before_top_and_sections_monolithic'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'isindex' => 1,
+            'normalized' => 'second',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'isindex' => 1,
+                'normalized' => 'a-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'another',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_prev' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first-before-top',
-      'spaces_before_argument' => ' '
     },
-    'menu_child' => {
+    'node_prev' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'node-in-menu-before-top',
+        'normalized' => 'first-before-top',
         'spaces_before_argument' => ' '
       },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
           }
         }
-      }
-    ],
-    'node_next' => {},
-    'node_up' => {
-      'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'dir'
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 'node-in-menu-before-top',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_up' => {}
           }
-        ]
+        },
+        'node_next' => {},
+        'node_up' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'dir'
+              }
+            ]
+          }
+        }
       }
     }
   }
 };
-$result_nodes{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_before_top_and_sections_monolithic'}{'menu_child'};
-$result_nodes{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'node_prev'}
 = $result_nodes{'nodes_before_top_and_sections_monolithic'};
-$result_nodes{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_before_top_and_sections_monolithic'};
-$result_nodes{'nodes_before_top_and_sections_monolithic'}{'node_prev'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_before_top_and_sections_monolithic'}{'node_prev'};
-$result_nodes{'nodes_before_top_and_sections_monolithic'}{'node_prev'}{'node_next'}
 = $result_nodes{'nodes_before_top_and_sections_monolithic'};
+$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_before_top_and_sections_monolithic'};
+$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top_and_sections_monolithic'};
+$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'node_prev'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'node_prev'};
+$result_nodes{'nodes_before_top_and_sections_monolithic'}{'structure'}{'node_prev'}{'structure'}{'node_next'}
 = $result_nodes{'nodes_before_top_and_sections_monolithic'};
 
 $result_menus{'nodes_before_top_and_sections_monolithic'} = {
   'cmdname' => 'node',
@@ -3481,89 +3506,103 @@ 
$result_menus{'nodes_before_top_and_sections_monolithic'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'second',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'isindex' => 1,
-          'normalized' => 'a-node',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 'second',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'isindex' => 1,
+                'normalized' => 'a-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'another',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'second' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'second' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'first' => 1
+            }
+          }
         },
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'another',
+            'isindex' => 1,
+            'normalized' => 'chapter',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'second' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'node-in-chapter',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
         'menu_up' => {},
-        'menu_up_hash' => {
-          'second' => 1
-        }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'first' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'isindex' => 1,
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'node-in-chapter',
-          'spaces_before_argument' => ' '
-        },
-        'menu_prev' => {},
-        'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'};
-$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_next'};
-$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_before_top_and_sections_monolithic'};
-$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'};
-$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_before_top_and_sections_monolithic'};
-$result_menus{'nodes_before_top_and_sections_monolithic'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_before_top_and_sections_monolithic'};
+$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_before_top_and_sections_monolithic'};
+$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_before_top_and_sections_monolithic'};
+$result_menus{'nodes_before_top_and_sections_monolithic'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_before_top_and_sections_monolithic'};
 
 $result_errors{'nodes_before_top_and_sections_monolithic'} = [];
 
diff --git a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl 
b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
index 07fd763d67..2b8c95dd30 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
@@ -369,7 +369,8 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -588,7 +589,8 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -947,7 +949,8 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1322,7 +1325,8 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1603,7 +1607,8 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         'line_nr' => 50,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1825,7 +1830,8 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         'line_nr' => 58,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2121,7 +2127,8 @@ $result_trees{'nodes_before_top_no_nodes'} = {
         'line_nr' => 64,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2575,38 +2582,29 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
+        }
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'second',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'isindex' => 1,
-          'normalized' => 'a-node',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'another',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -2622,92 +2620,115 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'isindex' => 1,
+            'normalized' => 'second',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'isindex' => 1,
+                'normalized' => 'a-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'another',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_prev' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first-before-top',
-      'spaces_before_argument' => ' '
     },
-    'menu_child' => {
+    'node_prev' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'node-in-menu-before-top',
+        'normalized' => 'first-before-top',
         'spaces_before_argument' => ' '
       },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
           }
         }
-      }
-    ],
-    'node_next' => {},
-    'node_up' => {
-      'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'dir'
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 'node-in-menu-before-top',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_up' => {}
           }
-        ]
+        },
+        'node_next' => {},
+        'node_up' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'dir'
+              }
+            ]
+          }
+        }
       }
     }
   }
 };
-$result_nodes{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_before_top_no_nodes'}{'menu_child'};
-$result_nodes{'nodes_before_top_no_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'nodes_before_top_no_nodes'};
-$result_nodes{'nodes_before_top_no_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'nodes_before_top_no_nodes'};
-$result_nodes{'nodes_before_top_no_nodes'}{'node_prev'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_before_top_no_nodes'}{'node_prev'};
-$result_nodes{'nodes_before_top_no_nodes'}{'node_prev'}{'node_next'} = 
$result_nodes{'nodes_before_top_no_nodes'};
+$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_before_top_no_nodes'};
+$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top_no_nodes'};
+$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'node_prev'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'node_prev'};
+$result_nodes{'nodes_before_top_no_nodes'}{'structure'}{'node_prev'}{'structure'}{'node_next'}
 = $result_nodes{'nodes_before_top_no_nodes'};
 
 $result_menus{'nodes_before_top_no_nodes'} = {
   'cmdname' => 'node',
@@ -2716,60 +2737,70 @@ $result_menus{'nodes_before_top_no_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'second',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'isindex' => 1,
-          'normalized' => 'a-node',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'another',
+            'isindex' => 1,
+            'normalized' => 'second',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'second' => 1
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'isindex' => 1,
+                'normalized' => 'a-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'another',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'second' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'second' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'first' => 1
+            }
           }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'second' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'first' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_before_top_no_nodes'}{'menu_child'};
-$result_menus{'nodes_before_top_no_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'nodes_before_top_no_nodes'};
+$result_menus{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_before_top_no_nodes'};
 
 $result_errors{'nodes_before_top_no_nodes'} = [];
 
diff --git a/tp/t/results/moreindices/nodes_before_top_nodes.pl 
b/tp/t/results/moreindices/nodes_before_top_nodes.pl
index f0e8694af7..09dcd1a362 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_nodes.pl
@@ -369,7 +369,8 @@ $result_trees{'nodes_before_top_nodes'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -588,7 +589,8 @@ $result_trees{'nodes_before_top_nodes'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -947,7 +949,8 @@ $result_trees{'nodes_before_top_nodes'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1322,7 +1325,8 @@ $result_trees{'nodes_before_top_nodes'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1603,7 +1607,8 @@ $result_trees{'nodes_before_top_nodes'} = {
         'line_nr' => 50,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1825,7 +1830,8 @@ $result_trees{'nodes_before_top_nodes'} = {
         'line_nr' => 58,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2121,7 +2127,8 @@ $result_trees{'nodes_before_top_nodes'} = {
         'line_nr' => 64,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2575,38 +2582,29 @@ $result_nodes{'nodes_before_top_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
+        }
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'second',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'isindex' => 1,
-          'normalized' => 'a-node',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'another',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -2622,92 +2620,115 @@ $result_nodes{'nodes_before_top_nodes'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'isindex' => 1,
+            'normalized' => 'second',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'isindex' => 1,
+                'normalized' => 'a-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'another',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_prev' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first-before-top',
-      'spaces_before_argument' => ' '
     },
-    'menu_child' => {
+    'node_prev' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'node-in-menu-before-top',
+        'normalized' => 'first-before-top',
         'spaces_before_argument' => ' '
       },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
           }
         }
-      }
-    ],
-    'node_next' => {},
-    'node_up' => {
-      'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'dir'
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'isindex' => 1,
+            'normalized' => 'node-in-menu-before-top',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_up' => {}
           }
-        ]
+        },
+        'node_next' => {},
+        'node_up' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'dir'
+              }
+            ]
+          }
+        }
       }
     }
   }
 };
-$result_nodes{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'}{'node_up'} 
= $result_nodes{'nodes_before_top_nodes'}{'menu_child'};
-$result_nodes{'nodes_before_top_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'nodes_before_top_nodes'};
-$result_nodes{'nodes_before_top_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'nodes_before_top_nodes'};
-$result_nodes{'nodes_before_top_nodes'}{'node_prev'}{'menu_child'}{'node_up'} 
= $result_nodes{'nodes_before_top_nodes'}{'node_prev'};
-$result_nodes{'nodes_before_top_nodes'}{'node_prev'}{'node_next'} = 
$result_nodes{'nodes_before_top_nodes'};
+$result_nodes{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_before_top_nodes'};
+$result_nodes{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top_nodes'};
+$result_nodes{'nodes_before_top_nodes'}{'structure'}{'node_prev'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top_nodes'}{'structure'}{'node_prev'};
+$result_nodes{'nodes_before_top_nodes'}{'structure'}{'node_prev'}{'structure'}{'node_next'}
 = $result_nodes{'nodes_before_top_nodes'};
 
 $result_menus{'nodes_before_top_nodes'} = {
   'cmdname' => 'node',
@@ -2716,60 +2737,70 @@ $result_menus{'nodes_before_top_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'second',
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'isindex' => 1,
-          'normalized' => 'a-node',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'another',
+            'isindex' => 1,
+            'normalized' => 'second',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'second' => 1
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'isindex' => 1,
+                'normalized' => 'a-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'another',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'second' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'second' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'first' => 1
+            }
           }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'second' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'first' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'nodes_before_top_nodes'}{'menu_child'}{'menu_child'}{'menu_up'} 
= $result_menus{'nodes_before_top_nodes'}{'menu_child'};
-$result_menus{'nodes_before_top_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'nodes_before_top_nodes'};
+$result_menus{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_before_top_nodes'}{'structure'}{'menu_child'};
+$result_menus{'nodes_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_before_top_nodes'};
 
 $result_errors{'nodes_before_top_nodes'} = [];
 
diff --git a/tp/t/results/moreindices/split_chapter_index.pl 
b/tp/t/results/moreindices/split_chapter_index.pl
index bf6f81b898..976edcd75b 100644
--- a/tp/t/results/moreindices/split_chapter_index.pl
+++ b/tp/t/results/moreindices/split_chapter_index.pl
@@ -111,7 +111,8 @@ $result_trees{'split_chapter_index'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -372,7 +373,8 @@ $result_trees{'split_chapter_index'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -963,7 +965,8 @@ $result_trees{'split_chapter_index'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1254,7 +1257,8 @@ $result_trees{'split_chapter_index'} = {
         'line_nr' => 48,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1684,7 +1688,8 @@ $result_sectioning{'split_chapter_index'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1700,7 +1705,8 @@ $result_sectioning{'split_chapter_index'} = {
                     'isindex' => 1,
                     'normalized' => 'first',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1716,7 +1722,8 @@ $result_sectioning{'split_chapter_index'} = {
                         'extra' => {
                           'normalized' => 'section-1',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1732,7 +1739,8 @@ $result_sectioning{'split_chapter_index'} = {
                               'extra' => {
                                 'normalized' => 'subsection-1',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1781,57 +1789,39 @@ $result_nodes{'split_chapter_index'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section-1',
+        'isindex' => 1,
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection-1',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1847,48 +1837,74 @@ $result_nodes{'split_chapter_index'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section-1',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection-1',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'split_chapter_index'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'split_chapter_index'}{'menu_child'}{'menu_child'};
-$result_nodes{'split_chapter_index'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'split_chapter_index'}{'menu_child'};
-$result_nodes{'split_chapter_index'}{'menu_child'}{'node_prev'} = 
$result_nodes{'split_chapter_index'};
-$result_nodes{'split_chapter_index'}{'menu_child'}{'node_up'} = 
$result_nodes{'split_chapter_index'};
-$result_nodes{'split_chapter_index'}{'node_next'} = 
$result_nodes{'split_chapter_index'}{'menu_child'};
+$result_nodes{'split_chapter_index'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'split_chapter_index'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'split_chapter_index'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'split_chapter_index'}{'structure'}{'menu_child'};
+$result_nodes{'split_chapter_index'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'split_chapter_index'};
+$result_nodes{'split_chapter_index'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'split_chapter_index'};
+$result_nodes{'split_chapter_index'}{'structure'}{'node_next'} = 
$result_nodes{'split_chapter_index'}{'structure'}{'menu_child'};
 
 $result_menus{'split_chapter_index'} = {
   'cmdname' => 'node',
@@ -1896,44 +1912,52 @@ $result_menus{'split_chapter_index'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'isindex' => 1,
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section-1',
+        'isindex' => 1,
+        'normalized' => 'first',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection-1',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section-1',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection-1',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'section-1' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'first' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'section-1' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'first' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'split_chapter_index'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'split_chapter_index'}{'menu_child'}{'menu_child'};
-$result_menus{'split_chapter_index'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'split_chapter_index'}{'menu_child'};
-$result_menus{'split_chapter_index'}{'menu_child'}{'menu_up'} = 
$result_menus{'split_chapter_index'};
+$result_menus{'split_chapter_index'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'split_chapter_index'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'split_chapter_index'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'split_chapter_index'}{'structure'}{'menu_child'};
+$result_menus{'split_chapter_index'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'split_chapter_index'};
 
 $result_errors{'split_chapter_index'} = [];
 
diff --git a/tp/t/results/moresectioning/equivalent_nodes.pl 
b/tp/t/results/moresectioning/equivalent_nodes.pl
index 15a6154e8a..0189351780 100644
--- a/tp/t/results/moresectioning/equivalent_nodes.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes.pl
@@ -184,7 +184,8 @@ $result_trees{'equivalent_nodes'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -383,7 +384,8 @@ $result_trees{'equivalent_nodes'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -731,7 +733,8 @@ $result_trees{'equivalent_nodes'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -912,15 +915,6 @@ $result_nodes{'equivalent_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -936,11 +930,24 @@ $result_nodes{'equivalent_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'equivalent_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'equivalent_nodes'};
-$result_nodes{'equivalent_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'equivalent_nodes'};
-$result_nodes{'equivalent_nodes'}{'node_next'} = 
$result_nodes{'equivalent_nodes'}{'menu_child'};
+$result_nodes{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'equivalent_nodes'};
+$result_nodes{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'equivalent_nodes'};
+$result_nodes{'equivalent_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'equivalent_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'equivalent_nodes'} = {
   'cmdname' => 'node',
@@ -948,19 +955,23 @@ $result_menus{'equivalent_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'equivalent_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'equivalent_nodes'};
+$result_menus{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'equivalent_nodes'};
 
 $result_errors{'equivalent_nodes'} = [
   {
diff --git a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl 
b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
index 189694ba72..54eaabbf9f 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
@@ -184,7 +184,8 @@ $result_trees{'equivalent_nodes_no_node'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -383,7 +384,8 @@ $result_trees{'equivalent_nodes_no_node'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -731,7 +733,8 @@ $result_trees{'equivalent_nodes_no_node'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -912,15 +915,6 @@ $result_nodes{'equivalent_nodes_no_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -936,11 +930,24 @@ $result_nodes{'equivalent_nodes_no_node'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'equivalent_nodes_no_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'equivalent_nodes_no_node'};
-$result_nodes{'equivalent_nodes_no_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'equivalent_nodes_no_node'};
-$result_nodes{'equivalent_nodes_no_node'}{'node_next'} = 
$result_nodes{'equivalent_nodes_no_node'}{'menu_child'};
+$result_nodes{'equivalent_nodes_no_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'equivalent_nodes_no_node'};
+$result_nodes{'equivalent_nodes_no_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'equivalent_nodes_no_node'};
+$result_nodes{'equivalent_nodes_no_node'}{'structure'}{'node_next'} = 
$result_nodes{'equivalent_nodes_no_node'}{'structure'}{'menu_child'};
 
 $result_menus{'equivalent_nodes_no_node'} = {
   'cmdname' => 'node',
@@ -948,19 +955,23 @@ $result_menus{'equivalent_nodes_no_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'equivalent_nodes_no_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'equivalent_nodes_no_node'};
+$result_menus{'equivalent_nodes_no_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'equivalent_nodes_no_node'};
 
 $result_errors{'equivalent_nodes_no_node'} = [
   {
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index d141706d6e..bde87a04fd 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -111,7 +111,8 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -461,7 +462,8 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -637,7 +639,8 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -874,7 +877,8 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1153,7 +1157,8 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1520,7 +1525,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1548,7 +1554,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   'extra' => {
                     'normalized' => 'n-c2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1582,7 +1589,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   'extra' => {
                     'normalized' => 'n-c3',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1609,7 +1617,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
                         'extra' => {
                           'normalized' => 'n-c3-s-2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1676,7 +1685,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
                               'extra' => {
                                 'normalized' => 'n-c3-s1-s2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1765,23 +1775,23 @@ $result_nodes{'more_sections_than_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 2
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'n-c2',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1791,95 +1801,105 @@ $result_nodes{'more_sections_than_nodes'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 3
+            'number' => 2
           }
         },
-        'normalized' => 'n-c3',
+        'normalized' => 'n-c2',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'spaces_before_argument' => ' '
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 3
+              }
             },
-            'structure' => {
-              'level' => 2,
-              'number' => '3.2'
-            }
+            'normalized' => 'n-c3',
+            'spaces_before_argument' => ' '
           },
-          'normalized' => 'n-c3-s-2',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
-      'menus' => [
-        {
-          'cmdname' => 'menu',
-          'extra' => {
-            'end_command' => {
-              'cmdname' => 'end',
+          'menus' => [
+            {
+              'cmdname' => 'menu',
               'extra' => {
-                'command_argument' => 'menu',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'menu'
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
               }
             }
-          }
-        }
-      ],
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'section',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2,
+                    'number' => '3.2'
+                  }
+                },
+                'normalized' => 'n-c3-s-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
             },
-            'structure' => {
-              'level' => 3,
-              'number' => '4.1.2'
-            }
-          },
-          'normalized' => 'n-c3-s1-s2',
-          'spaces_before_argument' => ' '
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '4.1.2'
+                  }
+                },
+                'normalized' => 'n-c3-s1-s2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'more_sections_than_nodes'}{'menu_child'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'more_sections_than_nodes'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'more_sections_than_nodes'};
-$result_nodes{'more_sections_than_nodes'}{'node_next'} = 
$result_nodes{'more_sections_than_nodes'}{'menu_child'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'more_sections_than_nodes'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'more_sections_than_nodes'} = {
   'cmdname' => 'node',
@@ -1887,59 +1907,69 @@ $result_menus{'more_sections_than_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'n-c2',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'n-c3',
+        'normalized' => 'n-c2',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'n-c3-s-2',
-          'spaces_before_argument' => ' '
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'n-c3' => 1
-        }
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'n-c3-s1-s2',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'n-c3',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'n-c3-s-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'n-c3' => 1
+                }
+              }
+            },
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'n-c3-s1-s2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'};
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'};
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'};
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'more_sections_than_nodes'}{'menu_child'};
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'};
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'more_sections_than_nodes'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'};
 
 $result_errors{'more_sections_than_nodes'} = [];
 
diff --git a/tp/t/results/moresectioning/node_footnote_end.pl 
b/tp/t/results/moresectioning/node_footnote_end.pl
index 1852f431fd..09c51f37e8 100644
--- a/tp/t/results/moresectioning/node_footnote_end.pl
+++ b/tp/t/results/moresectioning/node_footnote_end.pl
@@ -459,7 +459,8 @@ $result_trees{'node_footnote_end'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -627,7 +628,8 @@ $result_trees{'node_footnote_end'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -795,7 +797,8 @@ $result_trees{'node_footnote_end'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -836,7 +839,8 @@ $result_trees{'node_footnote_end'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1178,7 +1182,8 @@ $result_trees{'node_footnote_end'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1445,7 +1450,8 @@ $result_sectioning{'node_footnote_end'} = {
             'extra' => {
               'normalized' => 'chapter',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1466,68 +1472,6 @@ $result_nodes{'node_footnote_end'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_00e1',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => '_00e2',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 1
-            }
-          },
-          'normalized' => 'chapter',
-          'spaces_before_argument' => ' '
-        },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => '_00e0',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
-          }
-        ],
-        'node_next' => {},
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1543,18 +1487,90 @@ $result_nodes{'node_footnote_end'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => '_00e1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => '_00e2',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 1
+                  }
+                },
+                'normalized' => 'chapter',
+                'spaces_before_argument' => ' '
+              },
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
+                  'extra' => {
+                    'end_command' => {
+                      'cmdname' => 'end',
+                      'extra' => {
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
+                    }
+                  }
+                }
+              ],
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => '_00e0',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_next' => {},
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_prev'}
 = $result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = $result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}
 = 
$result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'};
-$result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'node_footnote_end'};
-$result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'node_footnote_end'}{'menu_child'};
-$result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'node_footnote_end'};
-$result_nodes{'node_footnote_end'}{'menu_child'}{'node_prev'} = 
$result_nodes{'node_footnote_end'};
-$result_nodes{'node_footnote_end'}{'menu_child'}{'node_up'} = 
$result_nodes{'node_footnote_end'};
-$result_nodes{'node_footnote_end'}{'node_next'} = 
$result_nodes{'node_footnote_end'}{'menu_child'};
+$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = 
$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}
 = 
$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'node_footnote_end'};
+$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'node_footnote_end'}{'structure'}{'menu_child'};
+$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'node_footnote_end'};
+$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'node_footnote_end'};
+$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'node_footnote_end'};
+$result_nodes{'node_footnote_end'}{'structure'}{'node_next'} = 
$result_nodes{'node_footnote_end'}{'structure'}{'menu_child'};
 
 $result_menus{'node_footnote_end'} = {
   'cmdname' => 'node',
@@ -1562,64 +1578,74 @@ $result_menus{'node_footnote_end'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_00e1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e2',
+        'normalized' => '_00e1',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'chapter',
-          'spaces_before_argument' => ' '
-        },
-        'menu_child' => {
+      'structure' => {
+        'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e0',
+            'normalized' => '_00e2',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1,
-            'chapter' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'chapter',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => '_00e0',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1,
+                      'chapter' => 1
+                    }
+                  }
+                },
+                'menu_next' => {},
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
-        'menu_next' => {},
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_prev'}
 = $result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}
 = 
$result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'};
-$result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'node_footnote_end'};
-$result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'node_footnote_end'}{'menu_child'};
-$result_menus{'node_footnote_end'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'node_footnote_end'};
-$result_menus{'node_footnote_end'}{'menu_child'}{'menu_up'} = 
$result_menus{'node_footnote_end'};
+$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_prev'}
 = 
$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}
 = 
$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'node_footnote_end'};
+$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'node_footnote_end'}{'structure'}{'menu_child'};
+$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'node_footnote_end'};
+$result_menus{'node_footnote_end'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'node_footnote_end'};
 
 $result_errors{'node_footnote_end'} = [
   {
diff --git a/tp/t/results/moresectioning/node_footnote_separated.pl 
b/tp/t/results/moresectioning/node_footnote_separated.pl
index 2806df240e..08fc0695f5 100644
--- a/tp/t/results/moresectioning/node_footnote_separated.pl
+++ b/tp/t/results/moresectioning/node_footnote_separated.pl
@@ -459,7 +459,8 @@ $result_trees{'node_footnote_separated'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -627,7 +628,8 @@ $result_trees{'node_footnote_separated'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -795,7 +797,8 @@ $result_trees{'node_footnote_separated'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -836,7 +839,8 @@ $result_trees{'node_footnote_separated'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1178,7 +1182,8 @@ $result_trees{'node_footnote_separated'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1445,7 +1450,8 @@ $result_sectioning{'node_footnote_separated'} = {
             'extra' => {
               'normalized' => 'chapter',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1466,68 +1472,6 @@ $result_nodes{'node_footnote_separated'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_00e1',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => '_00e2',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 1
-            }
-          },
-          'normalized' => 'chapter',
-          'spaces_before_argument' => ' '
-        },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => '_00e0',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
-          }
-        ],
-        'node_next' => {},
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1543,18 +1487,90 @@ $result_nodes{'node_footnote_separated'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => '_00e1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => '_00e2',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 1
+                  }
+                },
+                'normalized' => 'chapter',
+                'spaces_before_argument' => ' '
+              },
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
+                  'extra' => {
+                    'end_command' => {
+                      'cmdname' => 'end',
+                      'extra' => {
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
+                    }
+                  }
+                }
+              ],
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => '_00e0',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_next' => {},
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_prev'}
 = 
$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}
 = 
$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'};
-$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'node_footnote_separated'};
-$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'node_footnote_separated'}{'menu_child'};
-$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_up'} 
= $result_nodes{'node_footnote_separated'};
-$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_prev'} = 
$result_nodes{'node_footnote_separated'};
-$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_up'} = 
$result_nodes{'node_footnote_separated'};
-$result_nodes{'node_footnote_separated'}{'node_next'} = 
$result_nodes{'node_footnote_separated'}{'menu_child'};
+$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = 
$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}
 = 
$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'node_footnote_separated'};
+$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'};
+$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'node_footnote_separated'};
+$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'node_footnote_separated'};
+$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'node_footnote_separated'};
+$result_nodes{'node_footnote_separated'}{'structure'}{'node_next'} = 
$result_nodes{'node_footnote_separated'}{'structure'}{'menu_child'};
 
 $result_menus{'node_footnote_separated'} = {
   'cmdname' => 'node',
@@ -1562,64 +1578,74 @@ $result_menus{'node_footnote_separated'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_00e1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e2',
+        'normalized' => '_00e1',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'chapter',
-          'spaces_before_argument' => ' '
-        },
-        'menu_child' => {
+      'structure' => {
+        'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e0',
+            'normalized' => '_00e2',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1,
-            'chapter' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'chapter',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => '_00e0',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1,
+                      'chapter' => 1
+                    }
+                  }
+                },
+                'menu_next' => {},
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
-        'menu_next' => {},
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_prev'}
 = 
$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}
 = 
$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'};
-$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'node_footnote_separated'};
-$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'node_footnote_separated'}{'menu_child'};
-$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_next'}{'menu_up'} 
= $result_menus{'node_footnote_separated'};
-$result_menus{'node_footnote_separated'}{'menu_child'}{'menu_up'} = 
$result_menus{'node_footnote_separated'};
+$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_prev'}
 = 
$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}
 = 
$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'node_footnote_separated'};
+$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'node_footnote_separated'}{'structure'}{'menu_child'};
+$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'node_footnote_separated'};
+$result_menus{'node_footnote_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'node_footnote_separated'};
 
 $result_errors{'node_footnote_separated'} = [];
 
diff --git a/tp/t/results/moresectioning/node_footnote_use_node.pl 
b/tp/t/results/moresectioning/node_footnote_use_node.pl
index 1a2ab07f32..76eca3166f 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node.pl
+++ b/tp/t/results/moresectioning/node_footnote_use_node.pl
@@ -459,7 +459,8 @@ $result_trees{'node_footnote_use_node'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -627,7 +628,8 @@ $result_trees{'node_footnote_use_node'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -795,7 +797,8 @@ $result_trees{'node_footnote_use_node'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -836,7 +839,8 @@ $result_trees{'node_footnote_use_node'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1178,7 +1182,8 @@ $result_trees{'node_footnote_use_node'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1445,7 +1450,8 @@ $result_sectioning{'node_footnote_use_node'} = {
             'extra' => {
               'normalized' => 'chapter',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1466,68 +1472,6 @@ $result_nodes{'node_footnote_use_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_00e1',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => '_00e2',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 1
-            }
-          },
-          'normalized' => 'chapter',
-          'spaces_before_argument' => ' '
-        },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => '_00e0',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
-          }
-        ],
-        'node_next' => {},
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1543,18 +1487,90 @@ $result_nodes{'node_footnote_use_node'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => '_00e1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => '_00e2',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 1
+                  }
+                },
+                'normalized' => 'chapter',
+                'spaces_before_argument' => ' '
+              },
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
+                  'extra' => {
+                    'end_command' => {
+                      'cmdname' => 'end',
+                      'extra' => {
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
+                    }
+                  }
+                }
+              ],
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => '_00e0',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_next' => {},
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_prev'}
 = 
$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}
 = 
$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'};
-$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'node_footnote_use_node'};
-$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'node_footnote_use_node'}{'menu_child'};
-$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_up'} 
= $result_nodes{'node_footnote_use_node'};
-$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'node_footnote_use_node'};
-$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'node_footnote_use_node'};
-$result_nodes{'node_footnote_use_node'}{'node_next'} = 
$result_nodes{'node_footnote_use_node'}{'menu_child'};
+$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = 
$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}
 = 
$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'node_footnote_use_node'};
+$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'};
+$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'node_footnote_use_node'};
+$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'node_footnote_use_node'};
+$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'node_footnote_use_node'};
+$result_nodes{'node_footnote_use_node'}{'structure'}{'node_next'} = 
$result_nodes{'node_footnote_use_node'}{'structure'}{'menu_child'};
 
 $result_menus{'node_footnote_use_node'} = {
   'cmdname' => 'node',
@@ -1562,64 +1578,74 @@ $result_menus{'node_footnote_use_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_00e1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e2',
+        'normalized' => '_00e1',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'chapter',
-          'spaces_before_argument' => ' '
-        },
-        'menu_child' => {
+      'structure' => {
+        'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e0',
+            'normalized' => '_00e2',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1,
-            'chapter' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'chapter',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => '_00e0',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1,
+                      'chapter' => 1
+                    }
+                  }
+                },
+                'menu_next' => {},
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
-        'menu_next' => {},
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_prev'}
 = 
$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}
 = 
$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'};
-$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'node_footnote_use_node'};
-$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'node_footnote_use_node'}{'menu_child'};
-$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_next'}{'menu_up'} 
= $result_menus{'node_footnote_use_node'};
-$result_menus{'node_footnote_use_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'node_footnote_use_node'};
+$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_prev'}
 = 
$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}
 = 
$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'node_footnote_use_node'};
+$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'};
+$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'node_footnote_use_node'};
+$result_menus{'node_footnote_use_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'node_footnote_use_node'};
 
 $result_errors{'node_footnote_use_node'} = [];
 
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
index 4d9428c19e..fe79694f63 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
@@ -302,7 +302,8 @@ $result_trees{'nodes_after_top_before_chapter'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -418,7 +419,8 @@ $result_trees{'nodes_after_top_before_chapter'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -497,7 +499,8 @@ $result_trees{'nodes_after_top_before_chapter'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -694,7 +697,8 @@ $result_sectioning{'nodes_after_top_before_chapter'} = {
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -715,34 +719,6 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 1,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -758,13 +734,47 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_chapter'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter'};
-$result_nodes{'nodes_after_top_before_chapter'}{'menu_child'}{'node_prev'} = 
$result_nodes{'nodes_after_top_before_chapter'};
-$result_nodes{'nodes_after_top_before_chapter'}{'menu_child'}{'node_up'} = 
$result_nodes{'nodes_after_top_before_chapter'};
-$result_nodes{'nodes_after_top_before_chapter'}{'node_next'} = 
$result_nodes{'nodes_after_top_before_chapter'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter'};
+$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter'};
+$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter'};
+$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'node_next'} = 
$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'};
 
 $result_menus{'nodes_after_top_before_chapter'} = {
   'cmdname' => 'node',
@@ -772,33 +782,39 @@ $result_menus{'nodes_after_top_before_chapter'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_chapter'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'nodes_after_top_before_chapter'}{'menu_child'};
-$result_menus{'nodes_after_top_before_chapter'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter'};
-$result_menus{'nodes_after_top_before_chapter'}{'menu_child'}{'menu_up'} = 
$result_menus{'nodes_after_top_before_chapter'};
+$result_menus{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter'};
+$result_menus{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter'};
 
 $result_errors{'nodes_after_top_before_chapter'} = [];
 
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
index f44e5b5ed0..180b0708ce 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
@@ -302,7 +302,8 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -418,7 +419,8 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -497,7 +499,8 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -694,7 +697,8 @@ 
$result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -715,34 +719,6 @@ 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 1,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -758,13 +734,47 @@ 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'node_next'} 
= 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'node_next'}
 = 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'};
 
 $result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
   'cmdname' => 'node',
@@ -772,33 +782,39 @@ 
$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'};
-$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'};
-$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'};
+$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'};
+$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'};
 
 $result_errors{'nodes_after_top_before_chapter_use_nodes_chapter'} = [];
 
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_section.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
index 77c70ce0aa..86c809f98a 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
@@ -302,7 +302,8 @@ $result_trees{'nodes_after_top_before_section'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -418,7 +419,8 @@ $result_trees{'nodes_after_top_before_section'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -497,7 +499,8 @@ $result_trees{'nodes_after_top_before_section'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -694,7 +697,8 @@ $result_sectioning{'nodes_after_top_before_section'} = {
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -715,34 +719,6 @@ $result_nodes{'nodes_after_top_before_section'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'subsection',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 3,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -758,13 +734,47 @@ $result_nodes{'nodes_after_top_before_section'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'subsection',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 3,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_section'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section'};
-$result_nodes{'nodes_after_top_before_section'}{'menu_child'}{'node_prev'} = 
$result_nodes{'nodes_after_top_before_section'};
-$result_nodes{'nodes_after_top_before_section'}{'menu_child'}{'node_up'} = 
$result_nodes{'nodes_after_top_before_section'};
-$result_nodes{'nodes_after_top_before_section'}{'node_next'} = 
$result_nodes{'nodes_after_top_before_section'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section'};
+$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section'};
+$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section'};
+$result_nodes{'nodes_after_top_before_section'}{'structure'}{'node_next'} = 
$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'};
 
 $result_menus{'nodes_after_top_before_section'} = {
   'cmdname' => 'node',
@@ -772,33 +782,39 @@ $result_menus{'nodes_after_top_before_section'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_section'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'nodes_after_top_before_section'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section'};
-$result_menus{'nodes_after_top_before_section'}{'menu_child'}{'menu_up'} = 
$result_menus{'nodes_after_top_before_section'};
+$result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section'};
+$result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section'};
 
 $result_errors{'nodes_after_top_before_section'} = [];
 
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
index 51e623e01b..3df858180d 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
@@ -302,7 +302,8 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -418,7 +419,8 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -497,7 +499,8 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -694,7 +697,8 @@ 
$result_sectioning{'nodes_after_top_before_section_use_nodes'} = {
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -715,34 +719,6 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'subsection',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 3,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -758,13 +734,47 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} 
= {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'subsection',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 3,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes'};
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes'};
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes'};
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'node_next'} = 
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes'};
+$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes'};
+$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes'};
+$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'node_next'}
 = 
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'nodes_after_top_before_section_use_nodes'} = {
   'cmdname' => 'node',
@@ -772,33 +782,39 @@ $result_menus{'nodes_after_top_before_section_use_nodes'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'nodes_after_top_before_section_use_nodes'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_use_nodes'};
-$result_menus{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_use_nodes'};
+$result_menus{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_use_nodes'};
+$result_menus{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_use_nodes'};
 
 $result_errors{'nodes_after_top_before_section_use_nodes'} = [];
 
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
index 82ef904550..680d91a2cd 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
@@ -302,7 +302,8 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -418,7 +419,8 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -497,7 +499,8 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -694,7 +697,8 @@ 
$result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'} = {
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -715,34 +719,6 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'subsection',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 3,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -758,13 +734,47 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'subsection',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 3,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'node_next'} 
= 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'node_next'}
 = 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'};
 
 $result_menus{'nodes_after_top_before_section_use_nodes_chapter'} = {
   'cmdname' => 'node',
@@ -772,33 +782,39 @@ 
$result_menus{'nodes_after_top_before_section_use_nodes_chapter'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_use_nodes_chapter'};
-$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_use_nodes_chapter'};
+$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_use_nodes_chapter'};
+$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_use_nodes_chapter'};
 
 $result_errors{'nodes_after_top_before_section_use_nodes_chapter'} = [];
 
diff --git a/tp/t/results/moresectioning/sectioning_frames.pl 
b/tp/t/results/moresectioning/sectioning_frames.pl
index 31aeb8a252..8707d08c04 100644
--- a/tp/t/results/moresectioning/sectioning_frames.pl
+++ b/tp/t/results/moresectioning/sectioning_frames.pl
@@ -109,7 +109,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -762,7 +763,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 29,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1102,7 +1104,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 40,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1469,7 +1472,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 50,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1549,7 +1553,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1629,7 +1634,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 56,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1709,7 +1715,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 59,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1789,7 +1796,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 62,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1985,7 +1993,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 69,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2071,7 +2080,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 73,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2204,7 +2214,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 76,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2307,7 +2318,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 80,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2405,7 +2417,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 88,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2570,7 +2583,8 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 94,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3159,7 +3173,8 @@ $result_sectioning{'sectioning_frames'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -3173,7 +3188,8 @@ $result_sectioning{'sectioning_frames'} = {
                   'extra' => {
                     'normalized' => 'First-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3189,7 +3205,8 @@ $result_sectioning{'sectioning_frames'} = {
                         'extra' => {
                           'normalized' => 'unnumbered',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3204,7 +3221,8 @@ $result_sectioning{'sectioning_frames'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3221,7 +3239,8 @@ $result_sectioning{'sectioning_frames'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3239,7 +3258,8 @@ $result_sectioning{'sectioning_frames'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3257,7 +3277,8 @@ $result_sectioning{'sectioning_frames'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3279,7 +3300,8 @@ $result_sectioning{'sectioning_frames'} = {
                         'extra' => {
                           'normalized' => 'unnumbered2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3294,7 +3316,8 @@ $result_sectioning{'sectioning_frames'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3316,7 +3339,8 @@ $result_sectioning{'sectioning_frames'} = {
                         'extra' => {
                           'normalized' => 'numbered',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => '  '
                     },
@@ -3341,7 +3365,8 @@ $result_sectioning{'sectioning_frames'} = {
                   'extra' => {
                     'normalized' => 'Second-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3362,7 +3387,8 @@ $result_sectioning{'sectioning_frames'} = {
                   'extra' => {
                     'normalized' => 'Third-node-unnumbered',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3420,108 +3446,38 @@ $result_nodes{'sectioning_frames'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'First-node',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'unnumberedsec',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'unnumbered',
+        'normalized' => 'First-node',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'unnumberedsubsec',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3
-            }
-          },
-          'normalized' => 'unnumbered-sub',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'associated_section' => {
-              'cmdname' => 'subsection',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
-              'structure' => {
-                'level' => 3
-              }
-            },
-            'normalized' => 'numbered-sub',
-            'spaces_before_argument' => ' '
-          },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumberedsubsec',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 3
-                }
-              },
-              'normalized' => 'unnumbered-sub2',
-              'spaces_before_argument' => ' '
-            },
-            'node_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'associated_section' => {
-                  'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'structure' => {
-                    'level' => 3
-                  }
-                },
-                'normalized' => 'numbered-sub2',
-                'spaces_before_argument' => ' '
-              },
-              'node_prev' => {},
-              'node_up' => {}
-            },
-            'node_prev' => {},
-            'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -3537,137 +3493,227 @@ $result_nodes{'sectioning_frames'} = {
           }
         }
       ],
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'unnumberedsec',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2
-            }
-          },
-          'normalized' => 'unnumbered2',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'subsection',
+              'cmdname' => 'unnumberedsec',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 3
+                'level' => 2
               }
             },
-            'normalized' => 'numbered-sub3',
+            'normalized' => 'unnumbered',
             'spaces_before_argument' => ' '
           },
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
                 }
               }
             }
-          }
-        ],
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'associated_section' => {
-              'cmdname' => 'section',
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
               'extra' => {
-                'spaces_before_argument' => '  '
+                'associated_section' => {
+                  'cmdname' => 'unnumberedsubsec',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3
+                  }
+                },
+                'normalized' => 'unnumbered-sub',
+                'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'subsection',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 3
+                      }
+                    },
+                    'normalized' => 'numbered-sub',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'unnumberedsubsec',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 3
+                          }
+                        },
+                        'normalized' => 'unnumbered-sub2',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'subsection',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 3
+                              }
+                            },
+                            'normalized' => 'numbered-sub2',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_prev' => {},
+                            'node_up' => {}
+                          }
+                        },
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
               }
             },
-            'normalized' => 'numbered',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'unnumberedsec',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2
+                  }
+                },
+                'normalized' => 'unnumbered2',
+                'spaces_before_argument' => ' '
+              },
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
+                  'extra' => {
+                    'end_command' => {
+                      'cmdname' => 'end',
+                      'extra' => {
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
+                    }
+                  }
+                }
+              ],
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'subsection',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 3
+                      }
+                    },
+                    'normalized' => 'numbered-sub3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_up' => {}
+                  }
+                },
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'section',
+                      'extra' => {
+                        'spaces_before_argument' => '  '
+                      },
+                      'structure' => {
+                        'level' => 2,
+                        'number' => '1.1'
+                      }
+                    },
+                    'normalized' => 'numbered',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
       }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
+    },
+    'node_next' => {},
+    'node_prev' => {
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+        'manual_content' => [
+          {
+            'text' => 'dir'
           }
-        }
+        ]
       }
     }
-  ],
-  'node_next' => {},
-  'node_prev' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
-    }
   }
 };
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = $result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'sectioning_frames'}{'menu_child'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'sectioning_frames'}{'menu_child'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'sectioning_frames'}{'menu_child'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'node_prev'} = 
$result_nodes{'sectioning_frames'};
-$result_nodes{'sectioning_frames'}{'menu_child'}{'node_up'} = 
$result_nodes{'sectioning_frames'};
-$result_nodes{'sectioning_frames'}{'node_next'} = 
$result_nodes{'sectioning_frames'}{'menu_child'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'sectioning_frames'}{'structure'}{'menu_child'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'sectioning_frames'}{'structure'}{'menu_child'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'sectioning_frames'}{'structure'}{'menu_child'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'sectioning_frames'};
+$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'sectioning_frames'};
+$result_nodes{'sectioning_frames'}{'structure'}{'node_next'} = 
$result_nodes{'sectioning_frames'}{'structure'}{'menu_child'};
 
 $result_menus{'sectioning_frames'} = {
   'cmdname' => 'node',
@@ -3675,181 +3721,209 @@ $result_menus{'sectioning_frames'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'First-node',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'unnumbered',
+        'normalized' => 'First-node',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'unnumbered-sub',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'numbered-sub',
+            'normalized' => 'unnumbered',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumbered-sub2',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'unnumbered-sub',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'numbered-sub',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'unnumbered-sub2',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'numbered-sub2',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumbered' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'unnumbered' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'unnumbered' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'unnumbered' => 1
+                }
+              }
             },
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'numbered-sub2',
+                'normalized' => 'unnumbered2',
                 'spaces_before_argument' => ' '
               },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumbered' => 1
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'numbered-sub3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'unnumbered2' => 1
+                    }
+                  }
+                },
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'numbered',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'First-node' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'First-node' => 1
+                }
               }
             },
-            'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
-              'unnumbered' => 1
+              'First-node' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'unnumbered' => 1
-          }
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'unnumbered' => 1
-        }
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'unnumbered2',
-          'spaces_before_argument' => ' '
-        },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'numbered-sub3',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'unnumbered2' => 1
           }
         },
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'numbered',
+            'normalized' => 'between-node',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'First-node' => 1
-          }
-        },
-        'menu_prev' => {},
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'First-node' => 1
-        }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'First-node' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'between-node',
-        'spaces_before_argument' => ' '
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'Second-node',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'Third-node-unnumbered',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'Last-node-no-description',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'Second-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'Third-node-unnumbered',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'Last-node-no-description',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
             },
             'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'sectioning_frames'}{'menu_child'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'sectioning_frames'}{'menu_child'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'sectioning_frames'}{'menu_child'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'sectioning_frames'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'sectioning_frames'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'sectioning_frames'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'sectioning_frames'}{'menu_child'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'sectioning_frames'};
-$result_menus{'sectioning_frames'}{'menu_child'}{'menu_up'} = 
$result_menus{'sectioning_frames'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'sectioning_frames'}{'structure'}{'menu_child'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'sectioning_frames'}{'structure'}{'menu_child'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'sectioning_frames'}{'structure'}{'menu_child'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'sectioning_frames'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'sectioning_frames'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'sectioning_frames'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'sectioning_frames'}{'structure'}{'menu_child'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'sectioning_frames'};
+$result_menus{'sectioning_frames'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'sectioning_frames'};
 
 $result_errors{'sectioning_frames'} = [
   {
diff --git a/tp/t/results/moresectioning/top_node_up_explicit.pl 
b/tp/t/results/moresectioning/top_node_up_explicit.pl
index 535671ea77..ceccfe642b 100644
--- a/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_explicit.pl
@@ -223,7 +223,8 @@ $result_trees{'top_node_up_explicit'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -436,7 +437,8 @@ $result_trees{'top_node_up_explicit'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -635,7 +637,8 @@ $result_sectioning{'top_node_up_explicit'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -650,7 +653,8 @@ $result_sectioning{'top_node_up_explicit'} = {
                   'extra' => {
                     'normalized' => 'Chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -689,24 +693,6 @@ $result_nodes{'top_node_up_explicit'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'Chap',
-      'spaces_before_argument' => ' '
-    },
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -722,35 +708,57 @@ $result_nodes{'top_node_up_explicit'} = {
       }
     }
   ],
-  'node_next' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
-    }
-  },
-  'node_prev' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'weird'
-        }
-      ]
-    }
-  },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'Chap',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_up' => {}
+      }
+    },
+    'node_next' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
+    },
+    'node_prev' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'weird'
+          }
+        ]
+      }
+    },
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
     }
   }
 };
-$result_nodes{'top_node_up_explicit'}{'menu_child'}{'node_up'} = 
$result_nodes{'top_node_up_explicit'};
+$result_nodes{'top_node_up_explicit'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'top_node_up_explicit'};
 
 $result_menus{'top_node_up_explicit'} = {
   'cmdname' => 'node',
@@ -758,19 +766,23 @@ $result_menus{'top_node_up_explicit'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Chap',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'Chap',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'top_node_up_explicit'}{'menu_child'}{'menu_up'} = 
$result_menus{'top_node_up_explicit'};
+$result_menus{'top_node_up_explicit'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'top_node_up_explicit'};
 
 $result_errors{'top_node_up_explicit'} = [];
 
diff --git a/tp/t/results/moresectioning/top_node_up_implicit.pl 
b/tp/t/results/moresectioning/top_node_up_implicit.pl
index 36ab8290c1..83841374ee 100644
--- a/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_implicit.pl
@@ -129,7 +129,8 @@ $result_trees{'top_node_up_implicit'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -342,7 +343,8 @@ $result_trees{'top_node_up_implicit'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -523,7 +525,8 @@ $result_sectioning{'top_node_up_implicit'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -538,7 +541,8 @@ $result_sectioning{'top_node_up_implicit'} = {
                   'extra' => {
                     'normalized' => 'Chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -577,25 +581,6 @@ $result_nodes{'top_node_up_implicit'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'Chap',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -611,11 +596,34 @@ $result_nodes{'top_node_up_implicit'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'Chap',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'top_node_up_implicit'}{'menu_child'}{'node_prev'} = 
$result_nodes{'top_node_up_implicit'};
-$result_nodes{'top_node_up_implicit'}{'menu_child'}{'node_up'} = 
$result_nodes{'top_node_up_implicit'};
-$result_nodes{'top_node_up_implicit'}{'node_next'} = 
$result_nodes{'top_node_up_implicit'}{'menu_child'};
+$result_nodes{'top_node_up_implicit'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'top_node_up_implicit'};
+$result_nodes{'top_node_up_implicit'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'top_node_up_implicit'};
+$result_nodes{'top_node_up_implicit'}{'structure'}{'node_next'} = 
$result_nodes{'top_node_up_implicit'}{'structure'}{'menu_child'};
 
 $result_menus{'top_node_up_implicit'} = {
   'cmdname' => 'node',
@@ -623,19 +631,23 @@ $result_menus{'top_node_up_implicit'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Chap',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'Chap',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'top_node_up_implicit'}{'menu_child'}{'menu_up'} = 
$result_menus{'top_node_up_implicit'};
+$result_menus{'top_node_up_implicit'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'top_node_up_implicit'};
 
 $result_errors{'top_node_up_implicit'} = [];
 
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl 
b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
index 452ed8c465..0582ecdf86 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
@@ -111,7 +111,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -439,7 +440,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -785,7 +787,8 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -800,7 +803,8 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -839,25 +843,6 @@ $result_nodes{'two_footnotes_in_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -873,11 +858,34 @@ $result_nodes{'two_footnotes_in_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'two_footnotes_in_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'two_footnotes_in_nodes'};
-$result_nodes{'two_footnotes_in_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'two_footnotes_in_nodes'};
-$result_nodes{'two_footnotes_in_nodes'}{'node_next'} = 
$result_nodes{'two_footnotes_in_nodes'}{'menu_child'};
+$result_nodes{'two_footnotes_in_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'two_footnotes_in_nodes'};
+$result_nodes{'two_footnotes_in_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'two_footnotes_in_nodes'};
+$result_nodes{'two_footnotes_in_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'two_footnotes_in_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'two_footnotes_in_nodes'} = {
   'cmdname' => 'node',
@@ -885,19 +893,23 @@ $result_menus{'two_footnotes_in_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'two_footnotes_in_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'two_footnotes_in_nodes'};
+$result_menus{'two_footnotes_in_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'two_footnotes_in_nodes'};
 
 $result_errors{'two_footnotes_in_nodes'} = [];
 
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl 
b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
index 1853bbc536..731a44751e 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
@@ -111,7 +111,8 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -439,7 +440,8 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -785,7 +787,8 @@ $result_sectioning{'two_footnotes_in_nodes_separated'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -800,7 +803,8 @@ $result_sectioning{'two_footnotes_in_nodes_separated'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -839,25 +843,6 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -873,11 +858,34 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'two_footnotes_in_nodes_separated'}{'menu_child'}{'node_prev'} = 
$result_nodes{'two_footnotes_in_nodes_separated'};
-$result_nodes{'two_footnotes_in_nodes_separated'}{'menu_child'}{'node_up'} = 
$result_nodes{'two_footnotes_in_nodes_separated'};
-$result_nodes{'two_footnotes_in_nodes_separated'}{'node_next'} = 
$result_nodes{'two_footnotes_in_nodes_separated'}{'menu_child'};
+$result_nodes{'two_footnotes_in_nodes_separated'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'two_footnotes_in_nodes_separated'};
+$result_nodes{'two_footnotes_in_nodes_separated'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'two_footnotes_in_nodes_separated'};
+$result_nodes{'two_footnotes_in_nodes_separated'}{'structure'}{'node_next'} = 
$result_nodes{'two_footnotes_in_nodes_separated'}{'structure'}{'menu_child'};
 
 $result_menus{'two_footnotes_in_nodes_separated'} = {
   'cmdname' => 'node',
@@ -885,19 +893,23 @@ $result_menus{'two_footnotes_in_nodes_separated'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'two_footnotes_in_nodes_separated'}{'menu_child'}{'menu_up'} = 
$result_menus{'two_footnotes_in_nodes_separated'};
+$result_menus{'two_footnotes_in_nodes_separated'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'two_footnotes_in_nodes_separated'};
 
 $result_errors{'two_footnotes_in_nodes_separated'} = [];
 
diff --git a/tp/t/results/plaintext_tests/all_spaces.pl 
b/tp/t/results/plaintext_tests/all_spaces.pl
index e75befe5ec..11b3519c7e 100644
--- a/tp/t/results/plaintext_tests/all_spaces.pl
+++ b/tp/t/results/plaintext_tests/all_spaces.pl
@@ -558,7 +558,8 @@ $result_trees{'all_spaces'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -779,7 +780,8 @@ $result_nodes{'all_spaces'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'all_spaces'} = {
@@ -787,7 +789,8 @@ $result_menus{'all_spaces'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'all_spaces'} = [];
diff --git a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl 
b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
index 8cce5cda1b..695f2aa08c 100644
--- a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -358,7 +358,8 @@ $result_trees{'chinese_mixed_with_en'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -504,7 +505,8 @@ $result_nodes{'chinese_mixed_with_en'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'chinese_mixed_with_en'} = {
@@ -512,7 +514,8 @@ $result_menus{'chinese_mixed_with_en'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'chinese_mixed_with_en'} = [];
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 235199cc55..4f32c41f36 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -199,7 +199,8 @@ $result_trees{'japanese_utf8'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -659,7 +660,8 @@ $result_trees{'japanese_utf8'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -763,7 +765,8 @@ $result_trees{'japanese_utf8'} = {
         'line_nr' => 36,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1033,7 +1036,8 @@ $result_sectioning{'japanese_utf8'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1048,7 +1052,8 @@ $result_sectioning{'japanese_utf8'} = {
                   'extra' => {
                     'normalized' => 'Preface',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1068,7 +1073,8 @@ $result_sectioning{'japanese_utf8'} = {
                   'extra' => {
                     'normalized' => 'Introduction',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1112,23 +1118,23 @@ $result_nodes{'japanese_utf8'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'Preface',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1138,40 +1144,46 @@ $result_nodes{'japanese_utf8'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'Introduction',
+        'normalized' => 'Preface',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'Introduction',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'japanese_utf8'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'japanese_utf8'}{'menu_child'};
-$result_nodes{'japanese_utf8'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'japanese_utf8'};
-$result_nodes{'japanese_utf8'}{'menu_child'}{'node_prev'} = 
$result_nodes{'japanese_utf8'};
-$result_nodes{'japanese_utf8'}{'menu_child'}{'node_up'} = 
$result_nodes{'japanese_utf8'};
-$result_nodes{'japanese_utf8'}{'node_next'} = 
$result_nodes{'japanese_utf8'}{'menu_child'};
+$result_nodes{'japanese_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'japanese_utf8'}{'structure'}{'menu_child'};
+$result_nodes{'japanese_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'japanese_utf8'};
+$result_nodes{'japanese_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'japanese_utf8'};
+$result_nodes{'japanese_utf8'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'japanese_utf8'};
+$result_nodes{'japanese_utf8'}{'structure'}{'node_next'} = 
$result_nodes{'japanese_utf8'}{'structure'}{'menu_child'};
 
 $result_menus{'japanese_utf8'} = {
   'cmdname' => 'node',
@@ -1179,33 +1191,39 @@ $result_menus{'japanese_utf8'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Preface',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Introduction',
+        'normalized' => 'Preface',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Introduction',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'japanese_utf8'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'japanese_utf8'}{'menu_child'};
-$result_menus{'japanese_utf8'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'japanese_utf8'};
-$result_menus{'japanese_utf8'}{'menu_child'}{'menu_up'} = 
$result_menus{'japanese_utf8'};
+$result_menus{'japanese_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'japanese_utf8'}{'structure'}{'menu_child'};
+$result_menus{'japanese_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'japanese_utf8'};
+$result_menus{'japanese_utf8'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'japanese_utf8'};
 
 $result_errors{'japanese_utf8'} = [];
 
diff --git a/tp/t/results/plaintext_tests/line_passed_and_formats.pl 
b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
index 4df7152707..cd9f5d94ee 100644
--- a/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -2364,7 +2364,8 @@ $result_trees{'line_passed_and_formats'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -2943,16 +2944,6 @@ $result_nodes{'line_passed_and_formats'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'manual'
-        }
-      ],
-      'normalized' => 'node'
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -2968,9 +2959,21 @@ $result_nodes{'line_passed_and_formats'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'manual'
+          }
+        ],
+        'normalized' => 'node'
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'line_passed_and_formats'}{'node_next'} = 
$result_nodes{'line_passed_and_formats'}{'menu_child'};
+$result_nodes{'line_passed_and_formats'}{'structure'}{'node_next'} = 
$result_nodes{'line_passed_and_formats'}{'structure'}{'menu_child'};
 
 $result_menus{'line_passed_and_formats'} = {
   'cmdname' => 'node',
@@ -2978,14 +2981,16 @@ $result_menus{'line_passed_and_formats'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'manual'
-        }
-      ],
-      'normalized' => 'node'
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'manual'
+          }
+        ],
+        'normalized' => 'node'
+      }
     }
   }
 };
diff --git a/tp/t/results/plaintext_tests/non_break_spaces.pl 
b/tp/t/results/plaintext_tests/non_break_spaces.pl
index b717f99e06..d721d6777b 100644
--- a/tp/t/results/plaintext_tests/non_break_spaces.pl
+++ b/tp/t/results/plaintext_tests/non_break_spaces.pl
@@ -112,7 +112,8 @@ $result_trees{'non_break_spaces'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -152,7 +153,8 @@ $result_nodes{'non_break_spaces'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'non_break_spaces'} = {
@@ -160,7 +162,8 @@ $result_menus{'non_break_spaces'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'non_break_spaces'} = [];
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index c07eb3d995..0c7a3acc96 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -51,7 +51,8 @@ $result_trees{'quote_node_names'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -143,7 +144,8 @@ $result_trees{'quote_node_names'} = {
                     'line_nr' => 35,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -293,7 +295,8 @@ $result_trees{'quote_node_names'} = {
                     'line_nr' => 27,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -443,7 +446,8 @@ $result_trees{'quote_node_names'} = {
                     'line_nr' => 32,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -664,7 +668,8 @@ $result_trees{'quote_node_names'} = {
                     'line_nr' => 38,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -1452,7 +1457,8 @@ $result_trees{'quote_node_names'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -1774,7 +1780,8 @@ $result_sectioning{'quote_node_names'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -1788,7 +1795,8 @@ $result_sectioning{'quote_node_names'} = {
                   'extra' => {
                     'normalized' => 'blah_003ablah',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1808,7 +1816,8 @@ $result_sectioning{'quote_node_names'} = {
                   'extra' => {
                     'normalized' => 'blumpty_002efump',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1829,7 +1838,8 @@ $result_sectioning{'quote_node_names'} = {
                   'extra' => {
                     'normalized' => 'normal-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1850,7 +1860,8 @@ $result_sectioning{'quote_node_names'} = {
                   'extra' => {
                     'normalized' => 'secret_002cnode',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1900,23 +1911,23 @@ $result_nodes{'quote_node_names'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'blah_003ablah',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1926,28 +1937,13 @@ $result_nodes{'quote_node_names'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'blumpty_002efump',
+        'normalized' => 'blah_003ablah',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
-          },
-          'normalized' => 'normal-node',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
@@ -1958,50 +1954,75 @@ $result_nodes{'quote_node_names'} = {
               },
               'structure' => {
                 'level' => 1,
-                'number' => 4
+                'number' => 2
               }
             },
-            'normalized' => 'secret_002cnode',
+            'normalized' => 'blumpty_002efump',
             'spaces_before_argument' => ' '
           },
-          'node_prev' => {},
-          'node_up' => {}
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 3
+                  }
+                },
+                'normalized' => 'normal-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'chapter',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 1,
+                        'number' => 4
+                      }
+                    },
+                    'normalized' => 'secret_002cnode',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'quote_node_names'};
-$result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'quote_node_names'}{'menu_child'}{'node_next'};
-$result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'quote_node_names'};
-$result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'quote_node_names'}{'menu_child'};
-$result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'quote_node_names'};
-$result_nodes{'quote_node_names'}{'menu_child'}{'node_prev'} = 
$result_nodes{'quote_node_names'};
-$result_nodes{'quote_node_names'}{'menu_child'}{'node_up'} = 
$result_nodes{'quote_node_names'};
-$result_nodes{'quote_node_names'}{'node_next'} = 
$result_nodes{'quote_node_names'}{'menu_child'};
+$result_nodes{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'quote_node_names'};
+$result_nodes{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'quote_node_names'};
+$result_nodes{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'quote_node_names'}{'structure'}{'menu_child'};
+$result_nodes{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'quote_node_names'};
+$result_nodes{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'quote_node_names'};
+$result_nodes{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'quote_node_names'};
+$result_nodes{'quote_node_names'}{'structure'}{'node_next'} = 
$result_nodes{'quote_node_names'}{'structure'}{'menu_child'};
 
 $result_menus{'quote_node_names'} = {
   'cmdname' => 'node',
@@ -2009,61 +2030,71 @@ $result_menus{'quote_node_names'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'blah_003ablah',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'blumpty_002efump',
+        'normalized' => 'blah_003ablah',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'normal-node',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'secret_002cnode',
+            'normalized' => 'blumpty_002efump',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'normal-node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'secret_002cnode',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'quote_node_names'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'quote_node_names'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'quote_node_names'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'quote_node_names'};
-$result_menus{'quote_node_names'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'quote_node_names'}{'menu_child'}{'menu_next'};
-$result_menus{'quote_node_names'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'quote_node_names'};
-$result_menus{'quote_node_names'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'quote_node_names'}{'menu_child'};
-$result_menus{'quote_node_names'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'quote_node_names'};
-$result_menus{'quote_node_names'}{'menu_child'}{'menu_up'} = 
$result_menus{'quote_node_names'};
+$result_menus{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'quote_node_names'};
+$result_menus{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'quote_node_names'};
+$result_menus{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'quote_node_names'}{'structure'}{'menu_child'};
+$result_menus{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'quote_node_names'};
+$result_menus{'quote_node_names'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'quote_node_names'};
 
 $result_errors{'quote_node_names'} = [
   {
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index db3311a100..d91b36ced9 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -278,7 +278,8 @@ $result_trees{'anchor_in_copying'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -357,7 +358,8 @@ $result_nodes{'anchor_in_copying'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'anchor_in_copying'} = {
@@ -365,7 +367,8 @@ $result_menus{'anchor_in_copying'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'anchor_in_copying'} = [];
diff --git a/tp/t/results/regions/anchor_in_copying_in_footnote.pl 
b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
index 37b40d0271..1cd04a3f7b 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -309,7 +309,8 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -392,7 +393,8 @@ $result_nodes{'anchor_in_copying_in_footnote'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'anchor_in_copying_in_footnote'} = {
@@ -400,7 +402,8 @@ $result_menus{'anchor_in_copying_in_footnote'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'anchor_in_copying_in_footnote'} = [];
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 68c790ae60..470adb8932 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -235,7 +235,8 @@ $result_trees{'anchor_in_titlepage'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -316,7 +317,8 @@ $result_nodes{'anchor_in_titlepage'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'anchor_in_titlepage'} = {
@@ -324,7 +326,8 @@ $result_menus{'anchor_in_titlepage'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'anchor_in_titlepage'} = [];
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index 21468459ae..878ae426c9 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -235,7 +235,8 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -316,7 +317,8 @@ $result_nodes{'anchor_in_titlepage_titlepage'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'anchor_in_titlepage_titlepage'} = {
@@ -324,7 +326,8 @@ $result_menus{'anchor_in_titlepage_titlepage'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'anchor_in_titlepage_titlepage'} = [];
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index 5c2dcc047a..734c7990f4 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -194,7 +194,8 @@ $result_trees{'format_in_titlepage'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -248,7 +249,8 @@ $result_nodes{'format_in_titlepage'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'format_in_titlepage'} = {
@@ -256,7 +258,8 @@ $result_menus{'format_in_titlepage'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'format_in_titlepage'} = [];
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 5f13b3ab2c..1a6e320d6b 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -194,7 +194,8 @@ $result_trees{'format_in_titlepage_titlepage'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -248,7 +249,8 @@ $result_nodes{'format_in_titlepage_titlepage'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'format_in_titlepage_titlepage'} = {
@@ -256,7 +258,8 @@ $result_menus{'format_in_titlepage_titlepage'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'format_in_titlepage_titlepage'} = [];
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index c570f262d0..7465197eb3 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -78,7 +78,8 @@ $result_trees{'ref_in_copying'} = {
                         'line_nr' => 14,
                         'macro' => ''
                       },
-                      'parent' => {}
+                      'parent' => {},
+                      'structure' => {}
                     },
                     'node_argument' => {
                       'node_content' => [
@@ -193,7 +194,8 @@ $result_trees{'ref_in_copying'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -516,7 +518,8 @@ $result_sectioning{'ref_in_copying'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -531,7 +534,8 @@ $result_sectioning{'ref_in_copying'} = {
                   'extra' => {
                     'normalized' => 'GFDL',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -570,25 +574,6 @@ $result_nodes{'ref_in_copying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'GFDL',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -604,11 +589,34 @@ $result_nodes{'ref_in_copying'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'GFDL',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'ref_in_copying'}{'menu_child'}{'node_prev'} = 
$result_nodes{'ref_in_copying'};
-$result_nodes{'ref_in_copying'}{'menu_child'}{'node_up'} = 
$result_nodes{'ref_in_copying'};
-$result_nodes{'ref_in_copying'}{'node_next'} = 
$result_nodes{'ref_in_copying'}{'menu_child'};
+$result_nodes{'ref_in_copying'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'ref_in_copying'};
+$result_nodes{'ref_in_copying'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'ref_in_copying'};
+$result_nodes{'ref_in_copying'}{'structure'}{'node_next'} = 
$result_nodes{'ref_in_copying'}{'structure'}{'menu_child'};
 
 $result_menus{'ref_in_copying'} = {
   'cmdname' => 'node',
@@ -616,19 +624,23 @@ $result_menus{'ref_in_copying'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'GFDL',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'GFDL',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'ref_in_copying'}{'menu_child'}{'menu_up'} = 
$result_menus{'ref_in_copying'};
+$result_menus{'ref_in_copying'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'ref_in_copying'};
 
 $result_errors{'ref_in_copying'} = [];
 
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index a8ab3c4428..7092878088 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -139,7 +139,8 @@ $result_trees{'today_in_copying'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -254,7 +255,8 @@ $result_sectioning{'today_in_copying'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -282,7 +284,8 @@ $result_nodes{'today_in_copying'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'today_in_copying'} = {
@@ -290,7 +293,8 @@ $result_menus{'today_in_copying'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'today_in_copying'} = [];
diff --git a/tp/t/results/sectioning/a_comma_after_node.pl 
b/tp/t/results/sectioning/a_comma_after_node.pl
index 174e683d2b..603196a8d0 100644
--- a/tp/t/results/sectioning/a_comma_after_node.pl
+++ b/tp/t/results/sectioning/a_comma_after_node.pl
@@ -105,7 +105,8 @@ $result_trees{'a_comma_after_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -141,7 +142,8 @@ $result_nodes{'a_comma_after_node'} = {
   'extra' => {
     'normalized' => 'Commands',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'a_comma_after_node'} = {
@@ -149,7 +151,8 @@ $result_menus{'a_comma_after_node'} = {
   'extra' => {
     'normalized' => 'Commands',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'a_comma_after_node'} = [
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl 
b/tp/t/results/sectioning/anchor_in_footnote.pl
index 72e86acfe0..b2c1ac79b5 100644
--- a/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -51,7 +51,8 @@ $result_trees{'anchor_in_footnote'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -330,7 +331,8 @@ $result_trees{'anchor_in_footnote'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -518,7 +520,8 @@ $result_sectioning{'anchor_in_footnote'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -533,7 +536,8 @@ $result_sectioning{'anchor_in_footnote'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -572,25 +576,6 @@ $result_nodes{'anchor_in_footnote'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -606,11 +591,34 @@ $result_nodes{'anchor_in_footnote'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'anchor_in_footnote'}{'menu_child'}{'node_prev'} = 
$result_nodes{'anchor_in_footnote'};
-$result_nodes{'anchor_in_footnote'}{'menu_child'}{'node_up'} = 
$result_nodes{'anchor_in_footnote'};
-$result_nodes{'anchor_in_footnote'}{'node_next'} = 
$result_nodes{'anchor_in_footnote'}{'menu_child'};
+$result_nodes{'anchor_in_footnote'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'anchor_in_footnote'};
+$result_nodes{'anchor_in_footnote'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'anchor_in_footnote'};
+$result_nodes{'anchor_in_footnote'}{'structure'}{'node_next'} = 
$result_nodes{'anchor_in_footnote'}{'structure'}{'menu_child'};
 
 $result_menus{'anchor_in_footnote'} = {
   'cmdname' => 'node',
@@ -618,19 +626,23 @@ $result_menus{'anchor_in_footnote'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'anchor_in_footnote'}{'menu_child'}{'menu_up'} = 
$result_menus{'anchor_in_footnote'};
+$result_menus{'anchor_in_footnote'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'anchor_in_footnote'};
 
 $result_errors{'anchor_in_footnote'} = [];
 
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index d817599c7b..58ea45dd1b 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -83,7 +83,8 @@ $result_trees{'anchor_in_footnote_separate'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -362,7 +363,8 @@ $result_trees{'anchor_in_footnote_separate'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -554,7 +556,8 @@ $result_sectioning{'anchor_in_footnote_separate'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -569,7 +572,8 @@ $result_sectioning{'anchor_in_footnote_separate'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -608,25 +612,6 @@ $result_nodes{'anchor_in_footnote_separate'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -642,11 +627,34 @@ $result_nodes{'anchor_in_footnote_separate'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'anchor_in_footnote_separate'}{'menu_child'}{'node_prev'} = 
$result_nodes{'anchor_in_footnote_separate'};
-$result_nodes{'anchor_in_footnote_separate'}{'menu_child'}{'node_up'} = 
$result_nodes{'anchor_in_footnote_separate'};
-$result_nodes{'anchor_in_footnote_separate'}{'node_next'} = 
$result_nodes{'anchor_in_footnote_separate'}{'menu_child'};
+$result_nodes{'anchor_in_footnote_separate'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'anchor_in_footnote_separate'};
+$result_nodes{'anchor_in_footnote_separate'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'anchor_in_footnote_separate'};
+$result_nodes{'anchor_in_footnote_separate'}{'structure'}{'node_next'} = 
$result_nodes{'anchor_in_footnote_separate'}{'structure'}{'menu_child'};
 
 $result_menus{'anchor_in_footnote_separate'} = {
   'cmdname' => 'node',
@@ -654,19 +662,23 @@ $result_menus{'anchor_in_footnote_separate'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'anchor_in_footnote_separate'}{'menu_child'}{'menu_up'} = 
$result_menus{'anchor_in_footnote_separate'};
+$result_menus{'anchor_in_footnote_separate'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'anchor_in_footnote_separate'};
 
 $result_errors{'anchor_in_footnote_separate'} = [];
 
diff --git a/tp/t/results/sectioning/anchor_zero.pl 
b/tp/t/results/sectioning/anchor_zero.pl
index 714f0d802d..0ce386e43c 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -145,7 +145,8 @@ $result_trees{'anchor_zero'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -191,7 +192,8 @@ $result_nodes{'anchor_zero'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'anchor_zero'} = {
@@ -199,7 +201,8 @@ $result_menus{'anchor_zero'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'anchor_zero'} = [];
diff --git a/tp/t/results/sectioning/at_commands_in_node.pl 
b/tp/t/results/sectioning/at_commands_in_node.pl
index 6e53d4f2df..b61f54e10f 100644
--- a/tp/t/results/sectioning/at_commands_in_node.pl
+++ b/tp/t/results/sectioning/at_commands_in_node.pl
@@ -295,7 +295,8 @@ $result_trees{'at_commands_in_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -374,7 +375,8 @@ $result_nodes{'at_commands_in_node'} = {
   'extra' => {
     'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'at_commands_in_node'} = {
@@ -382,7 +384,8 @@ $result_menus{'at_commands_in_node'} = {
   'extra' => {
     'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'at_commands_in_node'} = [];
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 4df121c4a9..255cf8b57b 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -87,7 +87,8 @@ $result_trees{'chapter_between_nodes'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -379,7 +380,8 @@ $result_trees{'chapter_between_nodes'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -573,7 +575,8 @@ $result_sectioning{'chapter_between_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -597,7 +600,8 @@ $result_sectioning{'chapter_between_nodes'} = {
                         'extra' => {
                           'normalized' => 'section-node',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -641,25 +645,6 @@ $result_nodes{'chapter_between_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 2,
-          'number' => '1.1'
-        }
-      },
-      'normalized' => 'section-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -675,11 +660,34 @@ $result_nodes{'chapter_between_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'section',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 2,
+            'number' => '1.1'
+          }
+        },
+        'normalized' => 'section-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'chapter_between_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'chapter_between_nodes'};
-$result_nodes{'chapter_between_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'chapter_between_nodes'};
-$result_nodes{'chapter_between_nodes'}{'node_next'} = 
$result_nodes{'chapter_between_nodes'}{'menu_child'};
+$result_nodes{'chapter_between_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'chapter_between_nodes'};
+$result_nodes{'chapter_between_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'chapter_between_nodes'};
+$result_nodes{'chapter_between_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'chapter_between_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'chapter_between_nodes'} = {
   'cmdname' => 'node',
@@ -687,19 +695,23 @@ $result_menus{'chapter_between_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'section-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'section-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'chapter_between_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'chapter_between_nodes'};
+$result_menus{'chapter_between_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'chapter_between_nodes'};
 
 $result_errors{'chapter_between_nodes'} = [];
 
diff --git a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
index 3227de3467..f140333e69 100644
--- a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
@@ -58,7 +58,8 @@ $result_trees{'chapter_node_before_and_after_part'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -294,7 +295,8 @@ $result_trees{'chapter_node_before_and_after_part'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -446,7 +448,8 @@ $result_sectioning{'chapter_node_before_and_after_part'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -467,7 +470,8 @@ $result_sectioning{'chapter_node_before_and_after_part'} = {
                 'extra' => {
                   'normalized' => 'after',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -515,34 +519,6 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'associated_part' => {
-            'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 0
-            }
-          },
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 2
-        }
-      },
-      'normalized' => 'after',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -558,11 +534,43 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'associated_part' => {
+              'cmdname' => 'part',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 0
+              }
+            },
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 2
+          }
+        },
+        'normalized' => 'after',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'chapter_node_before_and_after_part'}{'menu_child'}{'node_prev'} 
= $result_nodes{'chapter_node_before_and_after_part'};
-$result_nodes{'chapter_node_before_and_after_part'}{'menu_child'}{'node_up'} = 
$result_nodes{'chapter_node_before_and_after_part'};
-$result_nodes{'chapter_node_before_and_after_part'}{'node_next'} = 
$result_nodes{'chapter_node_before_and_after_part'}{'menu_child'};
+$result_nodes{'chapter_node_before_and_after_part'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'chapter_node_before_and_after_part'};
+$result_nodes{'chapter_node_before_and_after_part'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'chapter_node_before_and_after_part'};
+$result_nodes{'chapter_node_before_and_after_part'}{'structure'}{'node_next'} 
= 
$result_nodes{'chapter_node_before_and_after_part'}{'structure'}{'menu_child'};
 
 $result_menus{'chapter_node_before_and_after_part'} = {
   'cmdname' => 'node',
@@ -570,19 +578,23 @@ $result_menus{'chapter_node_before_and_after_part'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'after',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'after',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'chapter_node_before_and_after_part'}{'menu_child'}{'menu_up'} = 
$result_menus{'chapter_node_before_and_after_part'};
+$result_menus{'chapter_node_before_and_after_part'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'chapter_node_before_and_after_part'};
 
 $result_errors{'chapter_node_before_and_after_part'} = [
   {
diff --git a/tp/t/results/sectioning/character_and_spaces_in_node.pl 
b/tp/t/results/sectioning/character_and_spaces_in_node.pl
index a9d59dbef0..81a3ec76aa 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -58,7 +58,8 @@ $result_trees{'character_and_spaces_in_node'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -154,7 +155,8 @@ $result_trees{'character_and_spaces_in_node'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -250,7 +252,8 @@ $result_trees{'character_and_spaces_in_node'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -340,7 +343,8 @@ $result_trees{'character_and_spaces_in_node'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -419,7 +423,8 @@ $result_trees{'character_and_spaces_in_node'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -504,58 +509,69 @@ $result_nodes{'character_and_spaces_in_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+        'normalized' => 'other-nodes',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
           },
-          'node_prev' => {},
-          'node_up' => {}
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'character_and_spaces_in_node'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'character_and_spaces_in_node'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'character_and_spaces_in_node'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_node'}{'node_next'};
-$result_nodes{'character_and_spaces_in_node'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_node'}{'node_next'}{'node_next'};
-$result_nodes{'character_and_spaces_in_node'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_node'}{'node_next'};
-$result_nodes{'character_and_spaces_in_node'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_node'}{'node_next'};
-$result_nodes{'character_and_spaces_in_node'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_node'}{'node_next'};
-$result_nodes{'character_and_spaces_in_node'}{'node_next'}{'node_prev'} = 
$result_nodes{'character_and_spaces_in_node'};
-$result_nodes{'character_and_spaces_in_node'}{'node_next'}{'node_up'} = 
$result_nodes{'character_and_spaces_in_node'};
+$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'};
+$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'};
+$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'};
+$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'};
+$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_node'};
+$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_node'};
 
 $result_menus{'character_and_spaces_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'character_and_spaces_in_node'} = [];
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
index 88123cf9a8..09d3e7b014 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -51,7 +51,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -677,7 +678,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
                     'line_nr' => 32,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -809,7 +811,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
                     'line_nr' => 34,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -972,7 +975,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
                     'line_nr' => 36,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -1111,7 +1115,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1699,7 +1704,8 @@ $result_sectioning{'character_and_spaces_in_refs'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1714,7 +1720,8 @@ $result_sectioning{'character_and_spaces_in_refs'} = {
                   'extra' => {
                     'normalized' => 'other-nodes',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1753,68 +1760,6 @@ $result_nodes{'character_and_spaces_in_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1830,18 +1775,90 @@ $result_nodes{'character_and_spaces_in_refs'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'other-nodes',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
+            }
+          }
+        }
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_refs'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'node_next'} = 
$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'node_prev'} = 
$result_nodes{'character_and_spaces_in_refs'};
-$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'node_up'} = 
$result_nodes{'character_and_spaces_in_refs'};
-$result_nodes{'character_and_spaces_in_refs'}{'node_next'} = 
$result_nodes{'character_and_spaces_in_refs'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = 
$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_refs'};
+$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs'};
+$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'node_next'} = 
$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'menu_child'};
 
 $result_menus{'character_and_spaces_in_refs'} = {
   'cmdname' => 'node',
@@ -1849,59 +1866,69 @@ $result_menus{'character_and_spaces_in_refs'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+        'normalized' => 'other-nodes',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'other-nodes' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'other-nodes' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'other-nodes' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'other-nodes' => 1
+            }
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'other-nodes' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'other-nodes' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs'}{'menu_child'};
-$result_menus{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'};
-$result_menus{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs'}{'menu_child'};
-$result_menus{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs'}{'menu_child'};
-$result_menus{'character_and_spaces_in_refs'}{'menu_child'}{'menu_up'} = 
$result_menus{'character_and_spaces_in_refs'};
+$result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'};
+$result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'};
+$result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'};
+$result_menus{'character_and_spaces_in_refs'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs'};
 
 $result_errors{'character_and_spaces_in_refs'} = [];
 
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
index 42b53387ba..14b0165e0b 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
@@ -52,7 +52,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -783,7 +784,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                                 'line_nr' => 23,
                                 'macro' => ''
                               },
-                              'parent' => {}
+                              'parent' => {},
+                              'structure' => {}
                             },
                             {
                               'args' => [
@@ -1068,7 +1070,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         }
                       },
                       'type' => 'unit'
-                    }
+                    },
+                    'structure' => {}
                   },
                   'node_argument' => {
                     'node_content' => [
@@ -1212,7 +1215,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'unit_prev' => {}
                       },
                       'type' => 'unit'
-                    }
+                    },
+                    'structure' => {}
                   },
                   'node_argument' => {
                     'node_content' => [
@@ -1399,7 +1403,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'unit_prev' => {}
                       },
                       'type' => 'unit'
-                    }
+                    },
+                    'structure' => {}
                   },
                   'node_argument' => {
                     'node_content' => [
@@ -1772,7 +1777,8 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1787,7 +1793,8 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                   'extra' => {
                     'normalized' => 'other-nodes',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1826,68 +1833,6 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1903,18 +1848,90 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'other-nodes',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
+            }
+          }
+        }
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'node_next'} = 
$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'node_prev'} = 
$result_nodes{'character_and_spaces_in_refs_out'};
-$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'node_up'} = 
$result_nodes{'character_and_spaces_in_refs_out'};
-$result_nodes{'character_and_spaces_in_refs_out'}{'node_next'} = 
$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = 
$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'character_and_spaces_in_refs_out'};
+$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'character_and_spaces_in_refs_out'};
+$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'node_next'} = 
$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'};
 
 $result_menus{'character_and_spaces_in_refs_out'} = {
   'cmdname' => 'node',
@@ -1922,59 +1939,69 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'other-nodes',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+        'normalized' => 'other-nodes',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'local-node',
-            'spaces_before_argument' => '  '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+            'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'other-nodes' => 1
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'local-node',
+                    'spaces_before_argument' => '  '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'other-nodes' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'other-nodes' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'other-nodes' => 1
+            }
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'other-nodes' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'other-nodes' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs_out'}{'menu_child'};
-$result_menus{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'};
-$result_menus{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs_out'}{'menu_child'};
-$result_menus{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs_out'}{'menu_child'};
-$result_menus{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_up'} = 
$result_menus{'character_and_spaces_in_refs_out'};
+$result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'};
+$result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'};
+$result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'};
+$result_menus{'character_and_spaces_in_refs_out'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'character_and_spaces_in_refs_out'};
 
 $result_errors{'character_and_spaces_in_refs_out'} = [];
 
@@ -1991,50 +2018,60 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'other-nodes',
-            'spaces_before_argument' => ' '
-          },
+        'structure' => {
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+              'normalized' => 'other-nodes',
               'spaces_before_argument' => ' '
             },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
-              },
-              'menu_next' => {
+            'structure' => {
+              'menu_child' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'local-node',
-                  'spaces_before_argument' => '  '
+                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
+                  'spaces_before_argument' => ' '
                 },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'other-nodes' => 1
+                'structure' => {
+                  'menu_next' => {
+                    'cmdname' => 'node',
+                    'extra' => {
+                      'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
+                      'spaces_before_argument' => ' '
+                    },
+                    'structure' => {
+                      'menu_next' => {
+                        'cmdname' => 'node',
+                        'extra' => {
+                          'normalized' => 'local-node',
+                          'spaces_before_argument' => '  '
+                        },
+                        'structure' => {
+                          'menu_prev' => {},
+                          'menu_up' => {},
+                          'menu_up_hash' => {
+                            'other-nodes' => 1
+                          }
+                        }
+                      },
+                      'menu_prev' => {},
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'other-nodes' => 1
+                      }
+                    }
+                  },
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'other-nodes' => 1
+                  }
                 }
               },
-              'menu_prev' => {},
               'menu_up' => {},
               'menu_up_hash' => {
-                'other-nodes' => 1
+                'Top' => 1
               }
-            },
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'other-nodes' => 1
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -2150,27 +2187,27 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
   {},
   {}
 ];
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'unit_command'}
 = $result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'character_and_spaces_in_refs_out'}[0];
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'character_and_spaces_in_refs_out'}[0];
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'};
diff --git a/tp/t/results/sectioning/complex.pl 
b/tp/t/results/sectioning/complex.pl
index e546f81727..695d44711c 100644
--- a/tp/t/results/sectioning/complex.pl
+++ b/tp/t/results/sectioning/complex.pl
@@ -91,7 +91,8 @@ $result_trees{'complex'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -608,7 +609,8 @@ $result_trees{'complex'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -961,7 +963,8 @@ $result_trees{'complex'} = [
           'line_nr' => 23,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1341,7 +1344,8 @@ $result_trees{'complex'} = [
           'line_nr' => 33,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1434,7 +1438,8 @@ $result_trees{'complex'} = [
           'line_nr' => 36,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1527,7 +1532,8 @@ $result_trees{'complex'} = [
           'line_nr' => 39,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1620,7 +1626,8 @@ $result_trees{'complex'} = [
           'line_nr' => 42,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1713,7 +1720,8 @@ $result_trees{'complex'} = [
           'line_nr' => 45,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1922,7 +1930,8 @@ $result_trees{'complex'} = [
           'line_nr' => 52,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -2021,7 +2030,8 @@ $result_trees{'complex'} = [
           'line_nr' => 56,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -2154,7 +2164,8 @@ $result_trees{'complex'} = [
           'line_nr' => 59,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -2270,7 +2281,8 @@ $result_trees{'complex'} = [
           'line_nr' => 63,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -2381,7 +2393,8 @@ $result_trees{'complex'} = [
           'line_nr' => 71,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -2546,7 +2559,8 @@ $result_trees{'complex'} = [
           'line_nr' => 76,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -2710,7 +2724,8 @@ $result_trees{'complex'} = [
           'line_nr' => 82,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -3331,7 +3346,8 @@ $result_sectioning{'complex'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -3345,7 +3361,8 @@ $result_sectioning{'complex'} = {
                   'extra' => {
                     'normalized' => 'First-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3361,7 +3378,8 @@ $result_sectioning{'complex'} = {
                         'extra' => {
                           'normalized' => 'unnumbered',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3376,7 +3394,8 @@ $result_sectioning{'complex'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3393,7 +3412,8 @@ $result_sectioning{'complex'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3411,7 +3431,8 @@ $result_sectioning{'complex'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3429,7 +3450,8 @@ $result_sectioning{'complex'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3451,7 +3473,8 @@ $result_sectioning{'complex'} = {
                         'extra' => {
                           'normalized' => 'unnumbered2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3466,7 +3489,8 @@ $result_sectioning{'complex'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3488,7 +3512,8 @@ $result_sectioning{'complex'} = {
                         'extra' => {
                           'normalized' => 'numbered',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => '  '
                     },
@@ -3513,7 +3538,8 @@ $result_sectioning{'complex'} = {
                   'extra' => {
                     'normalized' => 'Second-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3534,7 +3560,8 @@ $result_sectioning{'complex'} = {
                   'extra' => {
                     'normalized' => 'Third-node-unnumbered',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3554,7 +3581,8 @@ $result_sectioning{'complex'} = {
                   'extra' => {
                     'normalized' => 'continuity',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3616,108 +3644,38 @@ $result_nodes{'complex'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'First-node',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'unnumberedsec',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'unnumbered',
+        'normalized' => 'First-node',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'unnumberedsubsec',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3
-            }
-          },
-          'normalized' => 'unnumbered-sub',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'associated_section' => {
-              'cmdname' => 'subsection',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
-              'structure' => {
-                'level' => 3
-              }
-            },
-            'normalized' => 'numbered-sub',
-            'spaces_before_argument' => ' '
-          },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumberedsubsec',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 3
-                }
-              },
-              'normalized' => 'unnumbered-sub2',
-              'spaces_before_argument' => ' '
-            },
-            'node_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'associated_section' => {
-                  'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'structure' => {
-                    'level' => 3
-                  }
-                },
-                'normalized' => 'numbered-sub2',
-                'spaces_before_argument' => ' '
-              },
-              'node_prev' => {},
-              'node_up' => {}
-            },
-            'node_prev' => {},
-            'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -3733,277 +3691,412 @@ $result_nodes{'complex'} = {
           }
         }
       ],
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'unnumberedsec',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2
-            }
-          },
-          'normalized' => 'unnumbered2',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'subsection',
+              'cmdname' => 'unnumberedsec',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 3
+                'level' => 2
               }
             },
-            'normalized' => 'numbered-sub3',
+            'normalized' => 'unnumbered',
             'spaces_before_argument' => ' '
           },
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
                 }
               }
             }
-          }
-        ],
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'associated_section' => {
-              'cmdname' => 'section',
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
               'extra' => {
-                'spaces_before_argument' => '  '
+                'associated_section' => {
+                  'cmdname' => 'unnumberedsubsec',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3
+                  }
+                },
+                'normalized' => 'unnumbered-sub',
+                'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'subsection',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 3
+                      }
+                    },
+                    'normalized' => 'numbered-sub',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'unnumberedsubsec',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 3
+                          }
+                        },
+                        'normalized' => 'unnumbered-sub2',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'subsection',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 3
+                              }
+                            },
+                            'normalized' => 'numbered-sub2',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_prev' => {},
+                            'node_up' => {}
+                          }
+                        },
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
               }
             },
-            'normalized' => 'numbered',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
-      }
-    }
-  ],
-  'node_next' => {},
-  'node_prev' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
-    }
-  }
-};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'complex'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'complex'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'complex'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'complex'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} 
= $result_nodes{'complex'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = $result_nodes{'complex'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'complex'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'complex'}{'menu_child'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'} 
= $result_nodes{'complex'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'complex'}{'menu_child'};
-$result_nodes{'complex'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'complex'}{'menu_child'};
-$result_nodes{'complex'}{'menu_child'}{'node_prev'} = $result_nodes{'complex'};
-$result_nodes{'complex'}{'menu_child'}{'node_up'} = $result_nodes{'complex'};
-$result_nodes{'complex'}{'node_next'} = $result_nodes{'complex'}{'menu_child'};
-
-$result_menus{'complex'} = {
-  'cmdname' => 'node',
-  'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
-  },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'First-node',
-      'spaces_before_argument' => ' '
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'unnumberedsec',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2
+                  }
+                },
+                'normalized' => 'unnumbered2',
+                'spaces_before_argument' => ' '
+              },
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
+                  'extra' => {
+                    'end_command' => {
+                      'cmdname' => 'end',
+                      'extra' => {
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
+                    }
+                  }
+                }
+              ],
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'subsection',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 3
+                      }
+                    },
+                    'normalized' => 'numbered-sub3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_up' => {}
+                  }
+                },
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'section',
+                      'extra' => {
+                        'spaces_before_argument' => '  '
+                      },
+                      'structure' => {
+                        'level' => 2,
+                        'number' => '1.1'
+                      }
+                    },
+                    'normalized' => 'numbered',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
     },
+    'node_next' => {},
+    'node_prev' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
+    }
+  }
+};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'complex'}{'structure'}{'menu_child'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'complex'}{'structure'}{'menu_child'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'complex'}{'structure'}{'menu_child'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'node_prev'} 
= $result_nodes{'complex'};
+$result_nodes{'complex'}{'structure'}{'menu_child'}{'structure'}{'node_up'} = 
$result_nodes{'complex'};
+$result_nodes{'complex'}{'structure'}{'node_next'} = 
$result_nodes{'complex'}{'structure'}{'menu_child'};
+
+$result_menus{'complex'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top',
+    'spaces_before_argument' => ' '
+  },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'unnumbered',
+        'normalized' => 'First-node',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'unnumbered-sub',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'numbered-sub',
+            'normalized' => 'unnumbered',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumbered-sub2',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'unnumbered-sub',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'numbered-sub',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'unnumbered-sub2',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'numbered-sub2',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumbered' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'unnumbered' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'unnumbered' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'unnumbered' => 1
+                }
+              }
             },
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'numbered-sub2',
+                'normalized' => 'unnumbered2',
                 'spaces_before_argument' => ' '
               },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumbered' => 1
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'numbered-sub3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'unnumbered2' => 1
+                    }
+                  }
+                },
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'numbered',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'First-node' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'First-node' => 1
+                }
               }
             },
-            'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
-              'unnumbered' => 1
+              'First-node' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'unnumbered' => 1
-          }
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'unnumbered' => 1
-        }
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'unnumbered2',
-          'spaces_before_argument' => ' '
-        },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'numbered-sub3',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'unnumbered2' => 1
           }
         },
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'numbered',
+            'normalized' => 'between-node',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'First-node' => 1
-          }
-        },
-        'menu_prev' => {},
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'First-node' => 1
-        }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'First-node' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'between-node',
-        'spaces_before_argument' => ' '
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'Second-node',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'Third-node-unnumbered',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'continuity',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Last-node-no-description',
+                'normalized' => 'Second-node',
                 'spaces_before_argument' => ' '
               },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'Top' => 1
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'Third-node-unnumbered',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'continuity',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'Last-node-no-description',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'Top' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
               }
             },
             'menu_prev' => {},
@@ -4011,55 +4104,40 @@ $result_menus{'complex'} = {
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex'}{'menu_child'}{'menu_child'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex'}{'menu_child'}{'menu_child'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex'}{'menu_child'}{'menu_child'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'} 
= $result_menus{'complex'}{'menu_child'}{'menu_child'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex'}{'menu_child'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'} 
= $result_menus{'complex'}{'menu_child'}{'menu_child'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'complex'}{'menu_child'};
-$result_menus{'complex'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'complex'}{'menu_child'};
-$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex'};
-$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex'};
-$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex'};
-$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'} 
= $result_menus{'complex'}{'menu_child'}{'menu_next'};
-$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'} = 
$result_menus{'complex'};
-$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'complex'}{'menu_child'};
-$result_menus{'complex'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'complex'};
-$result_menus{'complex'}{'menu_child'}{'menu_up'} = $result_menus{'complex'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex'}{'structure'}{'menu_child'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex'}{'structure'}{'menu_child'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'complex'}{'structure'}{'menu_child'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'complex'}{'structure'}{'menu_child'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex'};
+$result_menus{'complex'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} = 
$result_menus{'complex'};
 
 $result_errors{'complex'} = [];
 
@@ -4076,139 +4154,184 @@ $result_elements{'complex'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'First-node',
-            'spaces_before_argument' => ' '
-          },
+        'structure' => {
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'unnumbered',
+              'normalized' => 'First-node',
               'spaces_before_argument' => ' '
             },
-            'menu_child' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'unnumbered-sub',
-                'spaces_before_argument' => ' '
-              },
-              'menu_next' => {
+            'structure' => {
+              'menu_child' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'numbered-sub',
+                  'normalized' => 'unnumbered',
                   'spaces_before_argument' => ' '
                 },
-                'menu_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'normalized' => 'unnumbered-sub2',
-                    'spaces_before_argument' => ' '
+                'structure' => {
+                  'menu_child' => {
+                    'cmdname' => 'node',
+                    'extra' => {
+                      'normalized' => 'unnumbered-sub',
+                      'spaces_before_argument' => ' '
+                    },
+                    'structure' => {
+                      'menu_next' => {
+                        'cmdname' => 'node',
+                        'extra' => {
+                          'normalized' => 'numbered-sub',
+                          'spaces_before_argument' => ' '
+                        },
+                        'structure' => {
+                          'menu_next' => {
+                            'cmdname' => 'node',
+                            'extra' => {
+                              'normalized' => 'unnumbered-sub2',
+                              'spaces_before_argument' => ' '
+                            },
+                            'structure' => {
+                              'menu_next' => {
+                                'cmdname' => 'node',
+                                'extra' => {
+                                  'normalized' => 'numbered-sub2',
+                                  'spaces_before_argument' => ' '
+                                },
+                                'structure' => {
+                                  'menu_prev' => {},
+                                  'menu_up' => {},
+                                  'menu_up_hash' => {
+                                    'unnumbered' => 1
+                                  }
+                                }
+                              },
+                              'menu_prev' => {},
+                              'menu_up' => {},
+                              'menu_up_hash' => {
+                                'unnumbered' => 1
+                              }
+                            }
+                          },
+                          'menu_prev' => {},
+                          'menu_up' => {},
+                          'menu_up_hash' => {
+                            'unnumbered' => 1
+                          }
+                        }
+                      },
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'unnumbered' => 1
+                      }
+                    }
                   },
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'numbered-sub2',
+                      'normalized' => 'unnumbered2',
                       'spaces_before_argument' => ' '
                     },
-                    'menu_prev' => {},
-                    'menu_up' => {},
-                    'menu_up_hash' => {
-                      'unnumbered' => 1
+                    'structure' => {
+                      'menu_child' => {
+                        'cmdname' => 'node',
+                        'extra' => {
+                          'normalized' => 'numbered-sub3',
+                          'spaces_before_argument' => ' '
+                        },
+                        'structure' => {
+                          'menu_up' => {},
+                          'menu_up_hash' => {
+                            'unnumbered2' => 1
+                          }
+                        }
+                      },
+                      'menu_next' => {
+                        'cmdname' => 'node',
+                        'extra' => {
+                          'normalized' => 'numbered',
+                          'spaces_before_argument' => ' '
+                        },
+                        'structure' => {
+                          'menu_prev' => {},
+                          'menu_up' => {},
+                          'menu_up_hash' => {
+                            'First-node' => 1
+                          }
+                        }
+                      },
+                      'menu_prev' => {},
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'First-node' => 1
+                      }
                     }
                   },
-                  'menu_prev' => {},
                   'menu_up' => {},
                   'menu_up_hash' => {
-                    'unnumbered' => 1
+                    'First-node' => 1
                   }
-                },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'unnumbered' => 1
-                }
-              },
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumbered' => 1
-              }
-            },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'unnumbered2',
-                'spaces_before_argument' => ' '
-              },
-              'menu_child' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'numbered-sub3',
-                  'spaces_before_argument' => ' '
-                },
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'unnumbered2' => 1
                 }
               },
               'menu_next' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'numbered',
+                  'normalized' => 'between-node',
                   'spaces_before_argument' => ' '
                 },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'First-node' => 1
-                }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'First-node' => 1
-              }
-            },
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'First-node' => 1
-            }
-          },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'between-node',
-              'spaces_before_argument' => ' '
-            },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'Second-node',
-                'spaces_before_argument' => ' '
-              },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'Third-node-unnumbered',
-                  'spaces_before_argument' => ' '
-                },
-                'menu_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'normalized' => 'continuity',
-                    'spaces_before_argument' => ' '
-                  },
+                'structure' => {
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'Last-node-no-description',
+                      'normalized' => 'Second-node',
                       'spaces_before_argument' => ' '
                     },
-                    'menu_prev' => {},
-                    'menu_up' => {},
-                    'menu_up_hash' => {
-                      'Top' => 1
+                    'structure' => {
+                      'menu_next' => {
+                        'cmdname' => 'node',
+                        'extra' => {
+                          'normalized' => 'Third-node-unnumbered',
+                          'spaces_before_argument' => ' '
+                        },
+                        'structure' => {
+                          'menu_next' => {
+                            'cmdname' => 'node',
+                            'extra' => {
+                              'normalized' => 'continuity',
+                              'spaces_before_argument' => ' '
+                            },
+                            'structure' => {
+                              'menu_next' => {
+                                'cmdname' => 'node',
+                                'extra' => {
+                                  'normalized' => 'Last-node-no-description',
+                                  'spaces_before_argument' => ' '
+                                },
+                                'structure' => {
+                                  'menu_prev' => {},
+                                  'menu_up' => {},
+                                  'menu_up_hash' => {
+                                    'Top' => 1
+                                  }
+                                }
+                              },
+                              'menu_prev' => {},
+                              'menu_up' => {},
+                              'menu_up_hash' => {
+                                'Top' => 1
+                              }
+                            }
+                          },
+                          'menu_prev' => {},
+                          'menu_up' => {},
+                          'menu_up_hash' => {
+                            'Top' => 1
+                          }
+                        }
+                      },
+                      'menu_prev' => {},
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'Top' => 1
+                      }
                     }
                   },
                   'menu_prev' => {},
@@ -4216,28 +4339,13 @@ $result_elements{'complex'} = [
                   'menu_up_hash' => {
                     'Top' => 1
                   }
-                },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'Top' => 1
                 }
               },
-              'menu_prev' => {},
               'menu_up' => {},
               'menu_up_hash' => {
                 'Top' => 1
               }
-            },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -4651,52 +4759,52 @@ $result_elements{'complex'} = [
   {},
   {}
 ];
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
-$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'} = 
$result_elements{'complex'}[0]{'extra'}{'node'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
+$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'complex'}[0]{'extra'}{'node'};
 $result_elements{'complex'}[0]{'extra'}{'unit_command'} = 
$result_elements{'complex'}[0]{'extra'}{'section'};
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'complex'}[0];
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0];
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'section'};
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_child'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'section'};
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'section'};
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'
 [...]
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'
 [...]
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'
 [...]
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'
 [...]
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Fast
 [...]
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = $result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'st 
[...]
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = $result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward [...]
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'complex'}[0]{'structure'}{'directions'}{'F [...]
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0]{'structure'}{'directions' [...]
@@ -4783,11 +4891,11 @@ 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'struct
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Up'}
 = $result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'};
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'};
-$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
+$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'};
diff --git a/tp/t/results/sectioning/complex_split_at_node.pl 
b/tp/t/results/sectioning/complex_split_at_node.pl
index e652369702..30718270e8 100644
--- a/tp/t/results/sectioning/complex_split_at_node.pl
+++ b/tp/t/results/sectioning/complex_split_at_node.pl
@@ -91,7 +91,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -608,7 +609,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -961,7 +963,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 23,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1341,7 +1344,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 33,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1434,7 +1438,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 36,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1527,7 +1532,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 39,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1620,7 +1626,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 42,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1713,7 +1720,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 45,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -1922,7 +1930,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 52,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -2021,7 +2030,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 56,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -2167,7 +2177,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 59,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -2282,7 +2293,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 63,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -2393,7 +2405,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 71,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -2558,7 +2571,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 76,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -2735,7 +2749,8 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 82,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -3361,7 +3376,8 @@ $result_sectioning{'complex_split_at_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -3375,7 +3391,8 @@ $result_sectioning{'complex_split_at_node'} = {
                   'extra' => {
                     'normalized' => 'First-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3391,7 +3408,8 @@ $result_sectioning{'complex_split_at_node'} = {
                         'extra' => {
                           'normalized' => 'unnumbered',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3406,7 +3424,8 @@ $result_sectioning{'complex_split_at_node'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3423,7 +3442,8 @@ $result_sectioning{'complex_split_at_node'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3441,7 +3461,8 @@ $result_sectioning{'complex_split_at_node'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3459,7 +3480,8 @@ $result_sectioning{'complex_split_at_node'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3481,7 +3503,8 @@ $result_sectioning{'complex_split_at_node'} = {
                         'extra' => {
                           'normalized' => 'unnumbered2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -3496,7 +3519,8 @@ $result_sectioning{'complex_split_at_node'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3518,7 +3542,8 @@ $result_sectioning{'complex_split_at_node'} = {
                         'extra' => {
                           'normalized' => 'numbered',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => '  '
                     },
@@ -3543,7 +3568,8 @@ $result_sectioning{'complex_split_at_node'} = {
                   'extra' => {
                     'normalized' => 'Second-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3564,7 +3590,8 @@ $result_sectioning{'complex_split_at_node'} = {
                   'extra' => {
                     'normalized' => 'Third-node-unnumbered',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3584,7 +3611,8 @@ $result_sectioning{'complex_split_at_node'} = {
                   'extra' => {
                     'normalized' => 'continuity',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3646,108 +3674,38 @@ $result_nodes{'complex_split_at_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'First-node',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'unnumberedsec',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'unnumbered',
+        'normalized' => 'First-node',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'unnumberedsubsec',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3
-            }
-          },
-          'normalized' => 'unnumbered-sub',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'associated_section' => {
-              'cmdname' => 'subsection',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
-              'structure' => {
-                'level' => 3
-              }
-            },
-            'normalized' => 'numbered-sub',
-            'spaces_before_argument' => ' '
-          },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumberedsubsec',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 3
-                }
-              },
-              'normalized' => 'unnumbered-sub2',
-              'spaces_before_argument' => ' '
-            },
-            'node_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'associated_section' => {
-                  'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'structure' => {
-                    'level' => 3
-                  }
-                },
-                'normalized' => 'numbered-sub2',
-                'spaces_before_argument' => ' '
-              },
-              'node_prev' => {},
-              'node_up' => {}
-            },
-            'node_prev' => {},
-            'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -3763,277 +3721,412 @@ $result_nodes{'complex_split_at_node'} = {
           }
         }
       ],
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'unnumberedsec',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2
-            }
-          },
-          'normalized' => 'unnumbered2',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'subsection',
+              'cmdname' => 'unnumberedsec',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 3
+                'level' => 2
               }
             },
-            'normalized' => 'numbered-sub3',
+            'normalized' => 'unnumbered',
             'spaces_before_argument' => ' '
           },
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
                 }
               }
             }
-          }
-        ],
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'associated_section' => {
-              'cmdname' => 'section',
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
               'extra' => {
-                'spaces_before_argument' => '  '
+                'associated_section' => {
+                  'cmdname' => 'unnumberedsubsec',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3
+                  }
+                },
+                'normalized' => 'unnumbered-sub',
+                'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'subsection',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 3
+                      }
+                    },
+                    'normalized' => 'numbered-sub',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'unnumberedsubsec',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 3
+                          }
+                        },
+                        'normalized' => 'unnumbered-sub2',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'node_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'subsection',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 3
+                              }
+                            },
+                            'normalized' => 'numbered-sub2',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_prev' => {},
+                            'node_up' => {}
+                          }
+                        },
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
               }
             },
-            'normalized' => 'numbered',
-            'spaces_before_argument' => ' '
-          },
-          'node_prev' => {},
-          'node_up' => {}
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
-      }
-    }
-  ],
-  'node_next' => {},
-  'node_prev' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
-    }
-  }
-};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'complex_split_at_node'}{'menu_child'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'complex_split_at_node'}{'menu_child'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'node_up'} 
= $result_nodes{'complex_split_at_node'}{'menu_child'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'complex_split_at_node'};
-$result_nodes{'complex_split_at_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'complex_split_at_node'};
-$result_nodes{'complex_split_at_node'}{'node_next'} = 
$result_nodes{'complex_split_at_node'}{'menu_child'};
-
-$result_menus{'complex_split_at_node'} = {
-  'cmdname' => 'node',
-  'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
-  },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'First-node',
-      'spaces_before_argument' => ' '
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'unnumberedsec',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2
+                  }
+                },
+                'normalized' => 'unnumbered2',
+                'spaces_before_argument' => ' '
+              },
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
+                  'extra' => {
+                    'end_command' => {
+                      'cmdname' => 'end',
+                      'extra' => {
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
+                    }
+                  }
+                }
+              ],
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'subsection',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 3
+                      }
+                    },
+                    'normalized' => 'numbered-sub3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_up' => {}
+                  }
+                },
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'section',
+                      'extra' => {
+                        'spaces_before_argument' => '  '
+                      },
+                      'structure' => {
+                        'level' => 2,
+                        'number' => '1.1'
+                      }
+                    },
+                    'normalized' => 'numbered',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
     },
+    'node_next' => {},
+    'node_prev' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
+    }
+  }
+};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'complex_split_at_node'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'complex_split_at_node'};
+$result_nodes{'complex_split_at_node'}{'structure'}{'node_next'} = 
$result_nodes{'complex_split_at_node'}{'structure'}{'menu_child'};
+
+$result_menus{'complex_split_at_node'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top',
+    'spaces_before_argument' => ' '
+  },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'unnumbered',
+        'normalized' => 'First-node',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'unnumbered-sub',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
+      'structure' => {
+        'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'numbered-sub',
+            'normalized' => 'unnumbered',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumbered-sub2',
-              'spaces_before_argument' => ' '
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'unnumbered-sub',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'numbered-sub',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'unnumbered-sub2',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'numbered-sub2',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumbered' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'unnumbered' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'unnumbered' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'unnumbered' => 1
+                }
+              }
             },
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'numbered-sub2',
+                'normalized' => 'unnumbered2',
                 'spaces_before_argument' => ' '
               },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumbered' => 1
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'numbered-sub3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'unnumbered2' => 1
+                    }
+                  }
+                },
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'numbered',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'First-node' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'First-node' => 1
+                }
               }
             },
-            'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
-              'unnumbered' => 1
+              'First-node' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'unnumbered' => 1
-          }
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'unnumbered' => 1
-        }
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'unnumbered2',
-          'spaces_before_argument' => ' '
-        },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'numbered-sub3',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'unnumbered2' => 1
           }
         },
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'numbered',
+            'normalized' => 'between-node',
             'spaces_before_argument' => ' '
           },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'First-node' => 1
-          }
-        },
-        'menu_prev' => {},
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'First-node' => 1
-        }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'First-node' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'between-node',
-        'spaces_before_argument' => ' '
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'Second-node',
-          'spaces_before_argument' => ' '
-        },
-        'menu_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'Third-node-unnumbered',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'continuity',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Last-node-no-description',
+                'normalized' => 'Second-node',
                 'spaces_before_argument' => ' '
               },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'Top' => 1
+              'structure' => {
+                'menu_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'Third-node-unnumbered',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'continuity',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'Last-node-no-description',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'Top' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
+                      }
+                    },
+                    'menu_prev' => {},
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
+                  }
+                },
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
               }
             },
             'menu_prev' => {},
@@ -4041,55 +4134,40 @@ $result_menus{'complex_split_at_node'} = {
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex_split_at_node'}{'menu_child'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex_split_at_node'}{'menu_child'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_child'}{'menu_up'} 
= $result_menus{'complex_split_at_node'}{'menu_child'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex_split_at_node'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex_split_at_node'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex_split_at_node'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'complex_split_at_node'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_prev'} 
= $result_menus{'complex_split_at_node'}{'menu_child'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'complex_split_at_node'};
-$result_menus{'complex_split_at_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'complex_split_at_node'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex_split_at_node'}{'structure'}{'menu_child'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex_split_at_node'}{'structure'}{'menu_child'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'complex_split_at_node'}{'structure'}{'menu_child'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex_split_at_node'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex_split_at_node'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex_split_at_node'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex_split_at_node'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'complex_split_at_node'}{'structure'}{'menu_child'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'complex_split_at_node'};
+$result_menus{'complex_split_at_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'complex_split_at_node'};
 
 $result_errors{'complex_split_at_node'} = [];
 
@@ -4106,139 +4184,184 @@ $result_elements{'complex_split_at_node'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'First-node',
-            'spaces_before_argument' => ' '
-          },
+        'structure' => {
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'unnumbered',
+              'normalized' => 'First-node',
               'spaces_before_argument' => ' '
             },
-            'menu_child' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'unnumbered-sub',
-                'spaces_before_argument' => ' '
-              },
-              'menu_next' => {
+            'structure' => {
+              'menu_child' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'numbered-sub',
+                  'normalized' => 'unnumbered',
                   'spaces_before_argument' => ' '
                 },
-                'menu_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'normalized' => 'unnumbered-sub2',
-                    'spaces_before_argument' => ' '
+                'structure' => {
+                  'menu_child' => {
+                    'cmdname' => 'node',
+                    'extra' => {
+                      'normalized' => 'unnumbered-sub',
+                      'spaces_before_argument' => ' '
+                    },
+                    'structure' => {
+                      'menu_next' => {
+                        'cmdname' => 'node',
+                        'extra' => {
+                          'normalized' => 'numbered-sub',
+                          'spaces_before_argument' => ' '
+                        },
+                        'structure' => {
+                          'menu_next' => {
+                            'cmdname' => 'node',
+                            'extra' => {
+                              'normalized' => 'unnumbered-sub2',
+                              'spaces_before_argument' => ' '
+                            },
+                            'structure' => {
+                              'menu_next' => {
+                                'cmdname' => 'node',
+                                'extra' => {
+                                  'normalized' => 'numbered-sub2',
+                                  'spaces_before_argument' => ' '
+                                },
+                                'structure' => {
+                                  'menu_prev' => {},
+                                  'menu_up' => {},
+                                  'menu_up_hash' => {
+                                    'unnumbered' => 1
+                                  }
+                                }
+                              },
+                              'menu_prev' => {},
+                              'menu_up' => {},
+                              'menu_up_hash' => {
+                                'unnumbered' => 1
+                              }
+                            }
+                          },
+                          'menu_prev' => {},
+                          'menu_up' => {},
+                          'menu_up_hash' => {
+                            'unnumbered' => 1
+                          }
+                        }
+                      },
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'unnumbered' => 1
+                      }
+                    }
                   },
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'numbered-sub2',
+                      'normalized' => 'unnumbered2',
                       'spaces_before_argument' => ' '
                     },
-                    'menu_prev' => {},
-                    'menu_up' => {},
-                    'menu_up_hash' => {
-                      'unnumbered' => 1
+                    'structure' => {
+                      'menu_child' => {
+                        'cmdname' => 'node',
+                        'extra' => {
+                          'normalized' => 'numbered-sub3',
+                          'spaces_before_argument' => ' '
+                        },
+                        'structure' => {
+                          'menu_up' => {},
+                          'menu_up_hash' => {
+                            'unnumbered2' => 1
+                          }
+                        }
+                      },
+                      'menu_next' => {
+                        'cmdname' => 'node',
+                        'extra' => {
+                          'normalized' => 'numbered',
+                          'spaces_before_argument' => ' '
+                        },
+                        'structure' => {
+                          'menu_prev' => {},
+                          'menu_up' => {},
+                          'menu_up_hash' => {
+                            'First-node' => 1
+                          }
+                        }
+                      },
+                      'menu_prev' => {},
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'First-node' => 1
+                      }
                     }
                   },
-                  'menu_prev' => {},
                   'menu_up' => {},
                   'menu_up_hash' => {
-                    'unnumbered' => 1
+                    'First-node' => 1
                   }
-                },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'unnumbered' => 1
-                }
-              },
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumbered' => 1
-              }
-            },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'unnumbered2',
-                'spaces_before_argument' => ' '
-              },
-              'menu_child' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'numbered-sub3',
-                  'spaces_before_argument' => ' '
-                },
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'unnumbered2' => 1
                 }
               },
               'menu_next' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'numbered',
+                  'normalized' => 'between-node',
                   'spaces_before_argument' => ' '
                 },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'First-node' => 1
-                }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'First-node' => 1
-              }
-            },
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'First-node' => 1
-            }
-          },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'between-node',
-              'spaces_before_argument' => ' '
-            },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'Second-node',
-                'spaces_before_argument' => ' '
-              },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'Third-node-unnumbered',
-                  'spaces_before_argument' => ' '
-                },
-                'menu_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'normalized' => 'continuity',
-                    'spaces_before_argument' => ' '
-                  },
+                'structure' => {
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'Last-node-no-description',
+                      'normalized' => 'Second-node',
                       'spaces_before_argument' => ' '
                     },
-                    'menu_prev' => {},
-                    'menu_up' => {},
-                    'menu_up_hash' => {
-                      'Top' => 1
+                    'structure' => {
+                      'menu_next' => {
+                        'cmdname' => 'node',
+                        'extra' => {
+                          'normalized' => 'Third-node-unnumbered',
+                          'spaces_before_argument' => ' '
+                        },
+                        'structure' => {
+                          'menu_next' => {
+                            'cmdname' => 'node',
+                            'extra' => {
+                              'normalized' => 'continuity',
+                              'spaces_before_argument' => ' '
+                            },
+                            'structure' => {
+                              'menu_next' => {
+                                'cmdname' => 'node',
+                                'extra' => {
+                                  'normalized' => 'Last-node-no-description',
+                                  'spaces_before_argument' => ' '
+                                },
+                                'structure' => {
+                                  'menu_prev' => {},
+                                  'menu_up' => {},
+                                  'menu_up_hash' => {
+                                    'Top' => 1
+                                  }
+                                }
+                              },
+                              'menu_prev' => {},
+                              'menu_up' => {},
+                              'menu_up_hash' => {
+                                'Top' => 1
+                              }
+                            }
+                          },
+                          'menu_prev' => {},
+                          'menu_up' => {},
+                          'menu_up_hash' => {
+                            'Top' => 1
+                          }
+                        }
+                      },
+                      'menu_prev' => {},
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'Top' => 1
+                      }
                     }
                   },
                   'menu_prev' => {},
@@ -4246,28 +4369,13 @@ $result_elements{'complex_split_at_node'} = [
                   'menu_up_hash' => {
                     'Top' => 1
                   }
-                },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'Top' => 1
                 }
               },
-              'menu_prev' => {},
               'menu_up' => {},
               'menu_up_hash' => {
                 'Top' => 1
               }
-            },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -4714,55 +4822,55 @@ $result_elements{'complex_split_at_node'} = [
   {},
   {}
 ];
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
 $result_elements{'complex_split_at_node'}[0]{'extra'}{'unit_command'} = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'complex_split_at_node'}[0];
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'complex_split_at_node'}[0];
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_child'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'menu_chi
 [...]
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_child'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'m [...]
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'n [...]
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = $result_elements{'complex_spl [...]
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = $result_elements{'com [...]
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{
 [...]
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu
 [...]
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu
 [...]
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure
 [...]
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure
 [...]
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'s
 [...]
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'s [...]
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'n [...]
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'node'}
 = $result_elements{'complex_spl [...]
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = $result_elements{'com [...]
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}
 = $result_ele [...]
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'FastBack'}
 = $result [...]
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'FastForward'}
 = $res [...]
@@ -4852,16 +4960,16 @@ 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastFor
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'NodeUp'}
 = $result_elements{'complex_split_at_node'}[0];
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'structure'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'};
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastF
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'F
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodePrev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'F
 [...]
diff --git a/tp/t/results/sectioning/contents_at_document_begin.pl 
b/tp/t/results/sectioning/contents_at_document_begin.pl
index d1a2039e83..a9d9c82017 100644
--- a/tp/t/results/sectioning/contents_at_document_begin.pl
+++ b/tp/t/results/sectioning/contents_at_document_begin.pl
@@ -134,7 +134,8 @@ $result_trees{'contents_at_document_begin'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -295,7 +296,8 @@ $result_sectioning{'contents_at_document_begin'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -341,7 +343,8 @@ $result_nodes{'contents_at_document_begin'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'contents_at_document_begin'} = {
@@ -349,7 +352,8 @@ $result_menus{'contents_at_document_begin'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'contents_at_document_begin'} = [];
diff --git a/tp/t/results/sectioning/contents_at_end_document.pl 
b/tp/t/results/sectioning/contents_at_end_document.pl
index 75ebbbdf5e..fb6312b3a2 100644
--- a/tp/t/results/sectioning/contents_at_end_document.pl
+++ b/tp/t/results/sectioning/contents_at_end_document.pl
@@ -111,7 +111,8 @@ $result_trees{'contents_at_end_document'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -295,7 +296,8 @@ $result_sectioning{'contents_at_end_document'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -341,7 +343,8 @@ $result_nodes{'contents_at_end_document'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'contents_at_end_document'} = {
@@ -349,7 +352,8 @@ $result_menus{'contents_at_end_document'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'contents_at_end_document'} = [];
diff --git a/tp/t/results/sectioning/contents_at_end_document_after_node.pl 
b/tp/t/results/sectioning/contents_at_end_document_after_node.pl
index 73da4f1003..4f776f0c24 100644
--- a/tp/t/results/sectioning/contents_at_end_document_after_node.pl
+++ b/tp/t/results/sectioning/contents_at_end_document_after_node.pl
@@ -111,7 +111,8 @@ $result_trees{'contents_at_end_document_after_node'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -405,7 +406,8 @@ $result_trees{'contents_at_end_document_after_node'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -525,7 +527,8 @@ $result_sectioning{'contents_at_end_document_after_node'} = 
{
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -572,15 +575,6 @@ $result_nodes{'contents_at_end_document_after_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'a-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -596,11 +590,24 @@ $result_nodes{'contents_at_end_document_after_node'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'a-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'contents_at_end_document_after_node'}{'menu_child'}{'node_prev'}
 = $result_nodes{'contents_at_end_document_after_node'};
-$result_nodes{'contents_at_end_document_after_node'}{'menu_child'}{'node_up'} 
= $result_nodes{'contents_at_end_document_after_node'};
-$result_nodes{'contents_at_end_document_after_node'}{'node_next'} = 
$result_nodes{'contents_at_end_document_after_node'}{'menu_child'};
+$result_nodes{'contents_at_end_document_after_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'contents_at_end_document_after_node'};
+$result_nodes{'contents_at_end_document_after_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'contents_at_end_document_after_node'};
+$result_nodes{'contents_at_end_document_after_node'}{'structure'}{'node_next'} 
= 
$result_nodes{'contents_at_end_document_after_node'}{'structure'}{'menu_child'};
 
 $result_menus{'contents_at_end_document_after_node'} = {
   'cmdname' => 'node',
@@ -608,19 +615,23 @@ $result_menus{'contents_at_end_document_after_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'a-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'a-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'contents_at_end_document_after_node'}{'menu_child'}{'menu_up'} 
= $result_menus{'contents_at_end_document_after_node'};
+$result_menus{'contents_at_end_document_after_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'contents_at_end_document_after_node'};
 
 $result_errors{'contents_at_end_document_after_node'} = [];
 
diff --git a/tp/t/results/sectioning/contents_in_document.pl 
b/tp/t/results/sectioning/contents_in_document.pl
index 3105e57a24..e76ba58619 100644
--- a/tp/t/results/sectioning/contents_in_document.pl
+++ b/tp/t/results/sectioning/contents_in_document.pl
@@ -111,7 +111,8 @@ $result_trees{'contents_in_document'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -295,7 +296,8 @@ $result_sectioning{'contents_in_document'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -341,7 +343,8 @@ $result_nodes{'contents_in_document'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'contents_in_document'} = {
@@ -349,7 +352,8 @@ $result_menus{'contents_in_document'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'contents_in_document'} = [];
diff --git a/tp/t/results/sectioning/contents_no_section.pl 
b/tp/t/results/sectioning/contents_no_section.pl
index 1c2103f7c5..782c64f32d 100644
--- a/tp/t/results/sectioning/contents_no_section.pl
+++ b/tp/t/results/sectioning/contents_no_section.pl
@@ -141,7 +141,8 @@ $result_trees{'contents_no_section'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -201,7 +202,8 @@ $result_nodes{'contents_no_section'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'contents_no_section'} = {
@@ -209,7 +211,8 @@ $result_menus{'contents_no_section'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'contents_no_section'} = [];
diff --git a/tp/t/results/sectioning/contents_with_only_top_node.pl 
b/tp/t/results/sectioning/contents_with_only_top_node.pl
index 9658019e30..de6dd95348 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -82,7 +82,8 @@ $result_trees{'contents_with_only_top_node'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -114,7 +115,8 @@ $result_nodes{'contents_with_only_top_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'contents_with_only_top_node'} = {
@@ -122,7 +124,8 @@ $result_menus{'contents_with_only_top_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'contents_with_only_top_node'} = [];
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index a0f4baeb78..0bf0e9b1cd 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -58,7 +58,8 @@ $result_trees{'double_node_anchor_float'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -177,7 +178,8 @@ $result_trees{'double_node_anchor_float'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -482,7 +484,8 @@ $result_trees{'double_node_anchor_float'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -519,7 +522,8 @@ $result_trees{'double_node_anchor_float'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -632,7 +636,8 @@ $result_nodes{'double_node_anchor_float'} = {
   'extra' => {
     'normalized' => 'node1',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'double_node_anchor_float'} = {
@@ -640,7 +645,8 @@ $result_menus{'double_node_anchor_float'} = {
   'extra' => {
     'normalized' => 'node1',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'double_node_anchor_float'} = [
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index 4692b7dc99..06be9e30d8 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -52,7 +52,8 @@ $result_trees{'double_part'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -373,7 +374,8 @@ $result_trees{'double_part'} = [
           'line_nr' => 14,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -542,7 +544,8 @@ $result_sectioning{'double_part'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -573,7 +576,8 @@ $result_sectioning{'double_part'} = {
                 'extra' => {
                   'normalized' => 'node-chapter',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -626,34 +630,6 @@ $result_nodes{'double_part'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'associated_part' => {
-            'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 0
-            }
-          },
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'node-chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -669,11 +645,43 @@ $result_nodes{'double_part'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'associated_part' => {
+              'cmdname' => 'part',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 0
+              }
+            },
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'node-chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'double_part'}{'menu_child'}{'node_prev'} = 
$result_nodes{'double_part'};
-$result_nodes{'double_part'}{'menu_child'}{'node_up'} = 
$result_nodes{'double_part'};
-$result_nodes{'double_part'}{'node_next'} = 
$result_nodes{'double_part'}{'menu_child'};
+$result_nodes{'double_part'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'double_part'};
+$result_nodes{'double_part'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'double_part'};
+$result_nodes{'double_part'}{'structure'}{'node_next'} = 
$result_nodes{'double_part'}{'structure'}{'menu_child'};
 
 $result_menus{'double_part'} = {
   'cmdname' => 'node',
@@ -681,19 +689,23 @@ $result_menus{'double_part'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node-chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'node-chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'double_part'}{'menu_child'}{'menu_up'} = 
$result_menus{'double_part'};
+$result_menus{'double_part'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'double_part'};
 
 $result_errors{'double_part'} = [
   {
@@ -739,15 +751,19 @@ $result_elements{'double_part'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'node-chapter',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'node-chapter',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -839,10 +855,10 @@ $result_elements{'double_part'} = [
   {}
 ];
 $result_elements{'double_part'}[0]{'extra'}{'first_in_page'} = 
$result_elements{'double_part'}[0];
-$result_elements{'double_part'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'} = 
$result_elements{'double_part'}[0]{'extra'}{'node'};
+$result_elements{'double_part'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'double_part'}[0]{'extra'}{'node'};
 $result_elements{'double_part'}[0]{'extra'}{'unit_command'} = 
$result_elements{'double_part'}[0]{'extra'}{'section'};
 
$result_elements{'double_part'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'first_in_page'}
 = $result_elements{'double_part'}[0]{'structure'}{'directions'}{'FastForward'};
-$result_elements{'double_part'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = $result_elements{'double_part'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'double_part'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'double_part'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'double_part'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'double_part'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'double_part'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'first_in_page'}
 = 
$result_elements{'double_part'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'};
 
$result_elements{'double_part'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'double_part'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}{'extra'}{'section'};
diff --git a/tp/t/results/sectioning/double_top.pl 
b/tp/t/results/sectioning/double_top.pl
index be5edc1ab5..e7af09a50c 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -75,7 +75,8 @@ $result_trees{'double_top'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -191,7 +192,8 @@ $result_trees{'double_top'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -243,16 +245,19 @@ $result_nodes{'double_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {}
+  'structure' => {
+    'node_next' => {}
+  }
 };
-$result_nodes{'double_top'}{'node_next'} = $result_nodes{'double_top'};
+$result_nodes{'double_top'}{'structure'}{'node_next'} = 
$result_nodes{'double_top'};
 
 $result_menus{'double_top'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'double_top'} = [
diff --git a/tp/t/results/sectioning/double_top_in_menu.pl 
b/tp/t/results/sectioning/double_top_in_menu.pl
index 0cab194479..82c8fe1f36 100644
--- a/tp/t/results/sectioning/double_top_in_menu.pl
+++ b/tp/t/results/sectioning/double_top_in_menu.pl
@@ -259,7 +259,8 @@ $result_trees{'double_top_in_menu'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -432,7 +433,6 @@ $result_nodes{'double_top_in_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {},
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -448,10 +448,13 @@ $result_nodes{'double_top_in_menu'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {},
+    'node_next' => {}
+  }
 };
-$result_nodes{'double_top_in_menu'}{'menu_child'} = 
$result_nodes{'double_top_in_menu'};
-$result_nodes{'double_top_in_menu'}{'node_next'} = 
$result_nodes{'double_top_in_menu'};
+$result_nodes{'double_top_in_menu'}{'structure'}{'menu_child'} = 
$result_nodes{'double_top_in_menu'};
+$result_nodes{'double_top_in_menu'}{'structure'}{'node_next'} = 
$result_nodes{'double_top_in_menu'};
 
 $result_menus{'double_top_in_menu'} = {
   'cmdname' => 'node',
@@ -459,18 +462,20 @@ $result_menus{'double_top_in_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {},
-  'menu_next' => {},
-  'menu_prev' => {},
-  'menu_up' => {},
-  'menu_up_hash' => {
-    'Top' => 1
+  'structure' => {
+    'menu_child' => {},
+    'menu_next' => {},
+    'menu_prev' => {},
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
-$result_menus{'double_top_in_menu'}{'menu_child'} = 
$result_menus{'double_top_in_menu'};
-$result_menus{'double_top_in_menu'}{'menu_next'} = 
$result_menus{'double_top_in_menu'};
-$result_menus{'double_top_in_menu'}{'menu_prev'} = 
$result_menus{'double_top_in_menu'};
-$result_menus{'double_top_in_menu'}{'menu_up'} = 
$result_menus{'double_top_in_menu'};
+$result_menus{'double_top_in_menu'}{'structure'}{'menu_child'} = 
$result_menus{'double_top_in_menu'};
+$result_menus{'double_top_in_menu'}{'structure'}{'menu_next'} = 
$result_menus{'double_top_in_menu'};
+$result_menus{'double_top_in_menu'}{'structure'}{'menu_prev'} = 
$result_menus{'double_top_in_menu'};
+$result_menus{'double_top_in_menu'}{'structure'}{'menu_up'} = 
$result_menus{'double_top_in_menu'};
 
 $result_errors{'double_top_in_menu'} = [
   {
diff --git a/tp/t/results/sectioning/email_in_node.pl 
b/tp/t/results/sectioning/email_in_node.pl
index fdd9280307..43481fa8ab 100644
--- a/tp/t/results/sectioning/email_in_node.pl
+++ b/tp/t/results/sectioning/email_in_node.pl
@@ -160,7 +160,8 @@ $result_trees{'email_in_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -204,7 +205,8 @@ $result_nodes{'email_in_node'} = {
   'extra' => {
     'normalized' => 'a-c-',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'email_in_node'} = {
@@ -212,7 +214,8 @@ $result_menus{'email_in_node'} = {
   'extra' => {
     'normalized' => 'a-c-',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'email_in_node'} = [];
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl 
b/tp/t/results/sectioning/empty_ref_arg.pl
index 9314fefab1..bac84c99bc 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -368,7 +368,8 @@ $result_trees{'empty_ref_arg'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -453,7 +454,8 @@ $result_nodes{'empty_ref_arg'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'empty_ref_arg'} = {
@@ -461,7 +463,8 @@ $result_menus{'empty_ref_arg'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'empty_ref_arg'} = [
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl 
b/tp/t/results/sectioning/empty_top_node_up.pl
index dc89704631..1f505c3a28 100644
--- a/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/tp/t/results/sectioning/empty_top_node_up.pl
@@ -51,7 +51,8 @@ $result_trees{'empty_top_node_up'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -247,7 +248,8 @@ $result_trees{'empty_top_node_up'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -316,7 +318,8 @@ $result_sectioning{'empty_top_node_up'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -345,15 +348,6 @@ $result_nodes{'empty_top_node_up'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -369,11 +363,24 @@ $result_nodes{'empty_top_node_up'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'empty_top_node_up'}{'menu_child'}{'node_prev'} = 
$result_nodes{'empty_top_node_up'};
-$result_nodes{'empty_top_node_up'}{'menu_child'}{'node_up'} = 
$result_nodes{'empty_top_node_up'};
-$result_nodes{'empty_top_node_up'}{'node_next'} = 
$result_nodes{'empty_top_node_up'}{'menu_child'};
+$result_nodes{'empty_top_node_up'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'empty_top_node_up'};
+$result_nodes{'empty_top_node_up'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'empty_top_node_up'};
+$result_nodes{'empty_top_node_up'}{'structure'}{'node_next'} = 
$result_nodes{'empty_top_node_up'}{'structure'}{'menu_child'};
 
 $result_menus{'empty_top_node_up'} = {
   'cmdname' => 'node',
@@ -381,19 +388,23 @@ $result_menus{'empty_top_node_up'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'empty_top_node_up'}{'menu_child'}{'menu_up'} = 
$result_menus{'empty_top_node_up'};
+$result_menus{'empty_top_node_up'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'empty_top_node_up'};
 
 $result_errors{'empty_top_node_up'} = [];
 
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index b02352f6c6..a19b201a2d 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -81,7 +81,8 @@ $result_trees{'equivalent_labels'} = {
             'line_nr' => 3,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'contents' => [
@@ -408,7 +409,8 @@ $result_trees{'equivalent_labels'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -504,13 +506,6 @@ $result_nodes{'equivalent_labels'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'anchor',
-    'extra' => {
-      'normalized' => 'anch'
-    },
-    'node_prev' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -526,10 +521,21 @@ $result_nodes{'equivalent_labels'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'anchor',
+      'extra' => {
+        'normalized' => 'anch'
+      },
+      'structure' => {
+        'node_prev' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'equivalent_labels'}{'menu_child'}{'node_prev'} = 
$result_nodes{'equivalent_labels'};
-$result_nodes{'equivalent_labels'}{'node_next'} = 
$result_nodes{'equivalent_labels'}{'menu_child'};
+$result_nodes{'equivalent_labels'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'equivalent_labels'};
+$result_nodes{'equivalent_labels'}{'structure'}{'node_next'} = 
$result_nodes{'equivalent_labels'}{'structure'}{'menu_child'};
 
 $result_menus{'equivalent_labels'} = {
   'cmdname' => 'node',
@@ -537,51 +543,55 @@ $result_menus{'equivalent_labels'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'anchor',
-    'extra' => {
-      'normalized' => 'anch'
-    },
-    'menu_next' => {
-      'cmdname' => 'float',
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'anchor',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+        'normalized' => 'anch'
+      },
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'float',
           'extra' => {
-            'command_argument' => 'float',
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'float',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'float'
+              }
+            },
+            'normalized' => 'floa',
             'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
+            'type' => {
+              'content' => [
+                {
+                  'text' => 'truc'
+                }
+              ],
+              'normalized' => 'truc'
+            }
+          },
+          'structure' => {
+            'float_number' => 1,
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
-        'normalized' => 'floa',
-        'spaces_before_argument' => ' ',
-        'type' => {
-          'content' => [
-            {
-              'text' => 'truc'
-            }
-          ],
-          'normalized' => 'truc'
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
-      },
-      'structure' => {
-        'float_number' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'equivalent_labels'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'equivalent_labels'}{'menu_child'};
-$result_menus{'equivalent_labels'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'equivalent_labels'};
-$result_menus{'equivalent_labels'}{'menu_child'}{'menu_up'} = 
$result_menus{'equivalent_labels'};
+$result_menus{'equivalent_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'equivalent_labels'}{'structure'}{'menu_child'};
+$result_menus{'equivalent_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'equivalent_labels'};
+$result_menus{'equivalent_labels'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'equivalent_labels'};
 
 $result_errors{'equivalent_labels'} = [
   {
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index fff025c0c3..66f2ea35b7 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -227,7 +227,8 @@ $result_trees{'equivalent_nodes'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -335,7 +336,8 @@ $result_trees{'equivalent_nodes'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -413,14 +415,6 @@ $result_nodes{'equivalent_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node',
-      'spaces_before_argument' => ' '
-    },
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -436,10 +430,22 @@ $result_nodes{'equivalent_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'equivalent_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'equivalent_nodes'};
-$result_nodes{'equivalent_nodes'}{'node_next'} = 
$result_nodes{'equivalent_nodes'}{'menu_child'};
+$result_nodes{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'equivalent_nodes'};
+$result_nodes{'equivalent_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'equivalent_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'equivalent_nodes'} = {
   'cmdname' => 'node',
@@ -447,19 +453,23 @@ $result_menus{'equivalent_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'equivalent_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'equivalent_nodes'};
+$result_menus{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'equivalent_nodes'};
 
 $result_errors{'equivalent_nodes'} = [
   {
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index e53c469b61..15bb074adf 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -237,7 +237,8 @@ $result_trees{'explicit_node_directions'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -363,7 +364,8 @@ $result_trees{'explicit_node_directions'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -454,7 +456,8 @@ $result_trees{'explicit_node_directions'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -572,24 +575,6 @@ $result_nodes{'explicit_node_directions'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -605,13 +590,37 @@ $result_nodes{'explicit_node_directions'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'explicit_node_directions'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'explicit_node_directions'}{'menu_child'};
-$result_nodes{'explicit_node_directions'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'explicit_node_directions'};
-$result_nodes{'explicit_node_directions'}{'menu_child'}{'node_prev'} = 
$result_nodes{'explicit_node_directions'};
-$result_nodes{'explicit_node_directions'}{'menu_child'}{'node_up'} = 
$result_nodes{'explicit_node_directions'};
-$result_nodes{'explicit_node_directions'}{'node_next'} = 
$result_nodes{'explicit_node_directions'}{'menu_child'};
+$result_nodes{'explicit_node_directions'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'explicit_node_directions'}{'structure'}{'menu_child'};
+$result_nodes{'explicit_node_directions'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'explicit_node_directions'};
+$result_nodes{'explicit_node_directions'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'explicit_node_directions'};
+$result_nodes{'explicit_node_directions'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'explicit_node_directions'};
+$result_nodes{'explicit_node_directions'}{'structure'}{'node_next'} = 
$result_nodes{'explicit_node_directions'}{'structure'}{'menu_child'};
 
 $result_menus{'explicit_node_directions'} = {
   'cmdname' => 'node',
@@ -619,33 +628,39 @@ $result_menus{'explicit_node_directions'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'explicit_node_directions'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'explicit_node_directions'}{'menu_child'};
-$result_menus{'explicit_node_directions'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'explicit_node_directions'};
-$result_menus{'explicit_node_directions'}{'menu_child'}{'menu_up'} = 
$result_menus{'explicit_node_directions'};
+$result_menus{'explicit_node_directions'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'explicit_node_directions'}{'structure'}{'menu_child'};
+$result_menus{'explicit_node_directions'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'explicit_node_directions'};
+$result_menus{'explicit_node_directions'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'explicit_node_directions'};
 
 $result_errors{'explicit_node_directions'} = [];
 
@@ -662,27 +677,33 @@ $result_elements{'explicit_node_directions'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'second-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
+              'normalized' => 'second-node',
               'spaces_before_argument' => ' '
             },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'third-node',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
+              },
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -734,15 +755,15 @@ $result_elements{'explicit_node_directions'} = [
   {},
   {}
 ];
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'explicit_node_directions'}[0]{'extra'}{'node'};
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'explicit_node_directions'}[0]{'extra'}{'node'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'explicit_node_directions'}[0]{'extra'}{'node'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'explicit_node_directions'}[0]{'extra'}{'node'};
 $result_elements{'explicit_node_directions'}[0]{'extra'}{'unit_command'} = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'};
-$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'explicit_node_directions'}[0];
-$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
+$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'};
 
$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = 
$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'};
 
$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodePrev'}
 = 
$result_elements{'explicit_node_directions'}[0]{'structure'}{'directions'}{'Forward'};
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index 94cccba5cb..b7e05ffbcb 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -51,7 +51,8 @@ $result_trees{'external_node_in_menu'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -376,7 +377,8 @@ $result_trees{'external_node_in_menu'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -457,7 +459,8 @@ $result_trees{'external_node_in_menu'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -608,7 +611,8 @@ $result_sectioning{'external_node_in_menu'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -623,7 +627,8 @@ $result_sectioning{'external_node_in_menu'} = {
                   'extra' => {
                     'normalized' => 'nchapter1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -643,7 +648,8 @@ $result_sectioning{'external_node_in_menu'} = {
                   'extra' => {
                     'normalized' => 'nchapter2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -687,23 +693,23 @@ $result_nodes{'external_node_in_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'nchapter1',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -713,40 +719,46 @@ $result_nodes{'external_node_in_menu'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'nchapter2',
+        'normalized' => 'nchapter1',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'nchapter2',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'external_node_in_menu'}{'menu_child'}{'node_next'}{'node_prev'} 
= $result_nodes{'external_node_in_menu'}{'menu_child'};
-$result_nodes{'external_node_in_menu'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'external_node_in_menu'};
-$result_nodes{'external_node_in_menu'}{'menu_child'}{'node_prev'} = 
$result_nodes{'external_node_in_menu'};
-$result_nodes{'external_node_in_menu'}{'menu_child'}{'node_up'} = 
$result_nodes{'external_node_in_menu'};
-$result_nodes{'external_node_in_menu'}{'node_next'} = 
$result_nodes{'external_node_in_menu'}{'menu_child'};
+$result_nodes{'external_node_in_menu'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'external_node_in_menu'}{'structure'}{'menu_child'};
+$result_nodes{'external_node_in_menu'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'external_node_in_menu'};
+$result_nodes{'external_node_in_menu'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'external_node_in_menu'};
+$result_nodes{'external_node_in_menu'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'external_node_in_menu'};
+$result_nodes{'external_node_in_menu'}{'structure'}{'node_next'} = 
$result_nodes{'external_node_in_menu'}{'structure'}{'menu_child'};
 
 $result_menus{'external_node_in_menu'} = {
   'cmdname' => 'node',
@@ -754,29 +766,33 @@ $result_menus{'external_node_in_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'nchapter1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
       'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'aaa'
+        'normalized' => 'nchapter1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_next' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'aaa'
+              }
+            ],
+            'normalized' => 'other'
           }
-        ],
-        'normalized' => 'other'
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'external_node_in_menu'}{'menu_child'}{'menu_up'} = 
$result_menus{'external_node_in_menu'};
+$result_menus{'external_node_in_menu'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'external_node_in_menu'};
 
 $result_errors{'external_node_in_menu'} = [];
 
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl 
b/tp/t/results/sectioning/internal_top_node_up.pl
index 1010f38ab3..ea78674b8f 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -52,7 +52,8 @@ $result_trees{'internal_top_node_up'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -259,7 +260,8 @@ $result_trees{'internal_top_node_up'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -342,7 +344,8 @@ $result_sectioning{'internal_top_node_up'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -371,15 +374,6 @@ $result_nodes{'internal_top_node_up'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -395,11 +389,24 @@ $result_nodes{'internal_top_node_up'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'internal_top_node_up'}{'menu_child'}{'node_prev'} = 
$result_nodes{'internal_top_node_up'};
-$result_nodes{'internal_top_node_up'}{'menu_child'}{'node_up'} = 
$result_nodes{'internal_top_node_up'};
-$result_nodes{'internal_top_node_up'}{'node_next'} = 
$result_nodes{'internal_top_node_up'}{'menu_child'};
+$result_nodes{'internal_top_node_up'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'internal_top_node_up'};
+$result_nodes{'internal_top_node_up'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'internal_top_node_up'};
+$result_nodes{'internal_top_node_up'}{'structure'}{'node_next'} = 
$result_nodes{'internal_top_node_up'}{'structure'}{'menu_child'};
 
 $result_menus{'internal_top_node_up'} = {
   'cmdname' => 'node',
@@ -407,19 +414,23 @@ $result_menus{'internal_top_node_up'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'internal_top_node_up'}{'menu_child'}{'menu_up'} = 
$result_menus{'internal_top_node_up'};
+$result_menus{'internal_top_node_up'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'internal_top_node_up'};
 
 $result_errors{'internal_top_node_up'} = [];
 
@@ -436,15 +447,19 @@ $result_elements{'internal_top_node_up'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'first',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'first',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -487,10 +502,10 @@ $result_elements{'internal_top_node_up'} = [
   },
   {}
 ];
-$result_elements{'internal_top_node_up'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'internal_top_node_up'}[0]{'extra'}{'node'};
+$result_elements{'internal_top_node_up'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'internal_top_node_up'}[0]{'extra'}{'node'};
 $result_elements{'internal_top_node_up'}[0]{'extra'}{'unit_command'} = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'node'};
-$result_elements{'internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = $result_elements{'internal_top_node_up'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = $result_elements{'internal_top_node_up'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'internal_top_node_up'}[0];
 
$result_elements{'internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'internal_top_node_up'}[0];
 
$result_elements{'internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = $result_elements{'internal_top_node_up'}[0];
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 980f03ab44..04e4e696e0 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -211,7 +211,8 @@ $result_trees{'lone_Top_node'} = [
           'line_nr' => 3,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -252,7 +253,8 @@ $result_trees{'lone_Top_node'} = [
           'line_nr' => 9,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -371,7 +373,8 @@ $result_sectioning{'lone_Top_node'} = {
             'extra' => {
               'normalized' => 'First',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -392,25 +395,6 @@ $result_nodes{'lone_Top_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'First',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -426,11 +410,34 @@ $result_nodes{'lone_Top_node'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'First',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'lone_Top_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'lone_Top_node'};
-$result_nodes{'lone_Top_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'lone_Top_node'};
-$result_nodes{'lone_Top_node'}{'node_next'} = 
$result_nodes{'lone_Top_node'}{'menu_child'};
+$result_nodes{'lone_Top_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'lone_Top_node'};
+$result_nodes{'lone_Top_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'lone_Top_node'};
+$result_nodes{'lone_Top_node'}{'structure'}{'node_next'} = 
$result_nodes{'lone_Top_node'}{'structure'}{'menu_child'};
 
 $result_menus{'lone_Top_node'} = {
   'cmdname' => 'node',
@@ -438,19 +445,23 @@ $result_menus{'lone_Top_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'First',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'First',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'lone_Top_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'lone_Top_node'};
+$result_menus{'lone_Top_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'lone_Top_node'};
 
 $result_errors{'lone_Top_node'} = [
   {
@@ -477,16 +488,20 @@ $result_elements{'lone_Top_node'} = [
           'normalized' => 'First',
           'spaces_before_argument' => ' '
         },
-        'menu_up' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'Top',
-            'spaces_before_argument' => ' '
+        'structure' => {
+          'menu_up' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'Top',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_child' => {}
+            }
           },
-          'menu_child' => {}
-        },
-        'menu_up_hash' => {
-          'Top' => 1
+          'menu_up_hash' => {
+            'Top' => 1
+          }
         }
       },
       'section' => {
@@ -511,7 +526,7 @@ $result_elements{'lone_Top_node'} = [
     'type' => 'unit'
   }
 ];
-$result_elements{'lone_Top_node'}[0]{'extra'}{'node'}{'menu_up'}{'menu_child'} 
= $result_elements{'lone_Top_node'}[0]{'extra'}{'node'};
+$result_elements{'lone_Top_node'}[0]{'extra'}{'node'}{'structure'}{'menu_up'}{'structure'}{'menu_child'}
 = $result_elements{'lone_Top_node'}[0]{'extra'}{'node'};
 $result_elements{'lone_Top_node'}[0]{'extra'}{'unit_command'} = 
$result_elements{'lone_Top_node'}[0]{'extra'}{'section'};
 $result_elements{'lone_Top_node'}[0]{'structure'}{'directions'}{'NodePrev'} = 
$result_elements{'lone_Top_node'}[0];
 $result_elements{'lone_Top_node'}[0]{'structure'}{'directions'}{'NodeUp'} = 
$result_elements{'lone_Top_node'}[0];
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index 9b6621856e..1a34c1555f 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -87,7 +87,8 @@ $result_trees{'loop_nodes'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -434,7 +435,8 @@ $result_trees{'loop_nodes'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -626,7 +628,8 @@ $result_trees{'loop_nodes'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -667,7 +670,8 @@ $result_trees{'loop_nodes'} = {
         'line_nr' => 22,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -819,7 +823,8 @@ $result_sectioning{'loop_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -848,26 +853,28 @@ $result_nodes{'loop_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node-up',
-      'spaces_before_argument' => ' '
-    },
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
+        }
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node-middle',
+        'normalized' => 'node-up',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'node-down',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -883,48 +890,54 @@ $result_nodes{'loop_nodes'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'normalized' => 'node-middle',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'node-down',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'loop_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'loop_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'loop_nodes'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'loop_nodes'}{'menu_child'};
-$result_nodes{'loop_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'loop_nodes'};
-$result_nodes{'loop_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'loop_nodes'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'loop_nodes'}{'node_next'} = 
$result_nodes{'loop_nodes'}{'menu_child'};
+$result_nodes{'loop_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'loop_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'loop_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'loop_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'loop_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'loop_nodes'};
+$result_nodes{'loop_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'} 
= 
$result_nodes{'loop_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'loop_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'loop_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'loop_nodes'} = {
   'cmdname' => 'node',
@@ -932,43 +945,51 @@ $result_menus{'loop_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node-up',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node-middle',
+        'normalized' => 'node-up',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'node-down',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node-middle',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'node-down',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'node-middle' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'node-up' => 1
+            }
+          }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'node-middle' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'node-up' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'loop_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'loop_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'loop_nodes'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'loop_nodes'}{'menu_child'};
-$result_menus{'loop_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'loop_nodes'};
+$result_menus{'loop_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'loop_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'loop_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'loop_nodes'}{'structure'}{'menu_child'};
+$result_menus{'loop_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} 
= $result_menus{'loop_nodes'};
 
 $result_errors{'loop_nodes'} = [
   {
diff --git a/tp/t/results/sectioning/lowered_subsubsection.pl 
b/tp/t/results/sectioning/lowered_subsubsection.pl
index 85b896c36c..76f4091d77 100644
--- a/tp/t/results/sectioning/lowered_subsubsection.pl
+++ b/tp/t/results/sectioning/lowered_subsubsection.pl
@@ -51,7 +51,8 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -240,7 +241,8 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -437,7 +439,8 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -634,7 +637,8 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 22,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -888,7 +892,8 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -981,7 +986,8 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 34,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1179,7 +1185,8 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1531,7 +1538,8 @@ $result_sectioning{'lowered_subsubsection'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -1545,7 +1553,8 @@ $result_sectioning{'lowered_subsubsection'} = {
                   'extra' => {
                     'normalized' => 'Chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1561,7 +1570,8 @@ $result_sectioning{'lowered_subsubsection'} = {
                         'extra' => {
                           'normalized' => 'Section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1577,7 +1587,8 @@ $result_sectioning{'lowered_subsubsection'} = {
                               'extra' => {
                                 'normalized' => 'Subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1593,7 +1604,8 @@ $result_sectioning{'lowered_subsubsection'} = {
                                     'extra' => {
                                       'normalized' => 'Subsubsection',
                                       'spaces_before_argument' => ' '
-                                    }
+                                    },
+                                    'structure' => {}
                                   },
                                   'spaces_before_argument' => ' '
                                 },
@@ -1611,7 +1623,8 @@ $result_sectioning{'lowered_subsubsection'} = {
                                     'extra' => {
                                       'normalized' => 'Lowered-subsec',
                                       'spaces_before_argument' => ' '
-                                    }
+                                    },
+                                    'structure' => {}
                                   },
                                   'sections_level' => -1,
                                   'spaces_before_argument' => ' '
@@ -1631,7 +1644,8 @@ $result_sectioning{'lowered_subsubsection'} = {
                                     'extra' => {
                                       'normalized' => 'Lowered-subsubsection',
                                       'spaces_before_argument' => ' '
-                                    }
+                                    },
+                                    'structure' => {}
                                   },
                                   'sections_level' => -1,
                                   'spaces_before_argument' => ' '
@@ -1689,208 +1703,222 @@ $result_nodes{'lowered_subsubsection'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'Chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'Section',
+        'normalized' => 'Chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
-          },
-          'normalized' => 'Subsection',
-          'spaces_before_argument' => ' '
-        },
+          }
+        }
+      ],
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'subsubsection',
+              'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 4,
-                'number' => '1.1.1.1'
+                'level' => 2,
+                'number' => '1.1'
               }
             },
-            'normalized' => 'Subsubsection',
+            'normalized' => 'Section',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'subsection',
-                'extra' => {
-                  'sections_level' => -1,
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 4,
-                  'number' => '1.1.1.2'
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
                 }
-              },
-              'normalized' => 'Lowered-subsec',
-              'spaces_before_argument' => ' '
-            },
+              }
+            }
+          ],
+          'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'associated_section' => {
-                  'cmdname' => 'subsubsection',
+                  'cmdname' => 'subsection',
                   'extra' => {
-                    'sections_level' => -1,
                     'spaces_before_argument' => ' '
                   },
                   'structure' => {
-                    'level' => 4,
-                    'number' => '1.1.1.3'
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'Lowered-subsubsection',
+                'normalized' => 'Subsection',
                 'spaces_before_argument' => ' '
               },
-              'node_prev' => {},
-              'node_up' => {}
-            },
-            'menus' => [
-              {
-                'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
+                  'extra' => {
+                    'end_command' => {
+                      'cmdname' => 'end',
+                      'extra' => {
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
                     }
                   }
                 }
+              ],
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'subsubsection',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 4,
+                        'number' => '1.1.1.1'
+                      }
+                    },
+                    'normalized' => 'Subsubsection',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'subsection',
+                          'extra' => {
+                            'sections_level' => -1,
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 4,
+                            'number' => '1.1.1.2'
+                          }
+                        },
+                        'normalized' => 'Lowered-subsec',
+                        'spaces_before_argument' => ' '
+                      },
+                      'menus' => [
+                        {
+                          'cmdname' => 'menu',
+                          'extra' => {
+                            'end_command' => {
+                              'cmdname' => 'end',
+                              'extra' => {
+                                'command_argument' => 'menu',
+                                'spaces_before_argument' => ' ',
+                                'text_arg' => 'menu'
+                              }
+                            }
+                          }
+                        }
+                      ],
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'subsubsection',
+                              'extra' => {
+                                'sections_level' => -1,
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 4,
+                                'number' => '1.1.1.3'
+                              }
+                            },
+                            'normalized' => 'Lowered-subsubsection',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_prev' => {},
+                            'node_up' => {}
+                          }
+                        },
+                        'node_next' => {},
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
               }
-            ],
-            'node_next' => {},
-            'node_prev' => {},
+            },
             'node_up' => {}
-          },
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
           }
-        ],
+        },
+        'node_prev' => {},
         'node_up' => {}
-      },
-      'menus' => [
-        {
-          'cmdname' => 'menu',
-          'extra' => {
-            'end_command' => {
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'menu',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'menu'
-              }
-            }
-          }
-        }
-      ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
       }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
-      }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'menu_child'}{'node_prev'}
 = 
$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}
 = 
$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'menu_child'};
-$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'};
-$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'node_up'} 
= $result_nodes{'lowered_subsubsection'}{'menu_child'};
-$result_nodes{'lowered_subsubsection'}{'menu_child'}{'node_prev'} = 
$result_nodes{'lowered_subsubsection'};
-$result_nodes{'lowered_subsubsection'}{'menu_child'}{'node_up'} = 
$result_nodes{'lowered_subsubsection'};
-$result_nodes{'lowered_subsubsection'}{'node_next'} = 
$result_nodes{'lowered_subsubsection'}{'menu_child'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = 
$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}
 = 
$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'lowered_subsubsection'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'lowered_subsubsection'};
+$result_nodes{'lowered_subsubsection'}{'structure'}{'node_next'} = 
$result_nodes{'lowered_subsubsection'}{'structure'}{'menu_child'};
 
 $result_menus{'lowered_subsubsection'} = {
   'cmdname' => 'node',
@@ -1898,81 +1926,95 @@ $result_menus{'lowered_subsubsection'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Section',
+        'normalized' => 'Chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'Subsection',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Subsubsection',
+            'normalized' => 'Section',
             'spaces_before_argument' => ' '
           },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'Lowered-subsec',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Lowered-subsubsection',
+                'normalized' => 'Subsection',
                 'spaces_before_argument' => ' '
               },
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'Lowered-subsec' => 1
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'Subsubsection',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'Lowered-subsec',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'Lowered-subsubsection',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'Lowered-subsec' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Subsection' => 1
+                        }
+                      }
+                    },
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Subsection' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Section' => 1
+                }
               }
             },
-            'menu_prev' => {},
             'menu_up' => {},
             'menu_up_hash' => {
-              'Subsection' => 1
+              'Chapter' => 1
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Subsection' => 1
           }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'Section' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'};
-$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_up'} 
= $result_menus{'lowered_subsubsection'}{'menu_child'};
-$result_menus{'lowered_subsubsection'}{'menu_child'}{'menu_up'} = 
$result_menus{'lowered_subsubsection'};
+$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'};
+$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'lowered_subsubsection'};
 
 $result_errors{'lowered_subsubsection'} = [
   {
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index e8eded04b7..d6fa651937 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -225,7 +225,8 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -422,7 +423,8 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -503,7 +505,8 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -590,7 +593,8 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -901,7 +905,8 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 29,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -982,7 +987,8 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 32,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1063,7 +1069,8 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 35,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1333,7 +1340,8 @@ $result_sectioning{'menutextorder'} = {
             'extra' => {
               'normalized' => 'bar',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1349,7 +1357,8 @@ $result_sectioning{'menutextorder'} = {
                   'extra' => {
                     'normalized' => 'onesub1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1367,7 +1376,8 @@ $result_sectioning{'menutextorder'} = {
                   'extra' => {
                     'normalized' => 'onesub2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1390,7 +1400,8 @@ $result_sectioning{'menutextorder'} = {
             'extra' => {
               'normalized' => 'foo',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1406,7 +1417,8 @@ $result_sectioning{'menutextorder'} = {
                   'extra' => {
                     'normalized' => 'sub1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1424,7 +1436,8 @@ $result_sectioning{'menutextorder'} = {
                   'extra' => {
                     'normalized' => 'sub2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1443,7 +1456,8 @@ $result_sectioning{'menutextorder'} = {
                   'extra' => {
                     'normalized' => 'sub3',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1492,43 +1506,6 @@ $result_nodes{'menutextorder'} = {
     'normalized' => 'bar',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 2,
-          'number' => '1.2'
-        }
-      },
-      'normalized' => 'onesub2',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'section',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 2,
-            'number' => '1.1'
-          }
-        },
-        'normalized' => 'onesub1',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {},
-      'node_up' => {}
-    },
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1544,22 +1521,7 @@ $result_nodes{'menutextorder'} = {
       }
     }
   ],
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 2
-        }
-      },
-      'normalized' => 'foo',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
@@ -1570,29 +1532,14 @@ $result_nodes{'menutextorder'} = {
           },
           'structure' => {
             'level' => 2,
-            'number' => '2.1'
+            'number' => '1.2'
           }
         },
-        'normalized' => 'sub1',
+        'normalized' => 'onesub2',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2,
-              'number' => '2.2'
-            }
-          },
-          'normalized' => 'sub2',
-          'spaces_before_argument' => ' '
-        },
-        'node_next' => {
+      'structure' => {
+        'node_prev' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
@@ -1602,49 +1549,130 @@ $result_nodes{'menutextorder'} = {
               },
               'structure' => {
                 'level' => 2,
-                'number' => '2.3'
+                'number' => '1.1'
               }
             },
-            'normalized' => 'sub3',
+            'normalized' => 'onesub1',
             'spaces_before_argument' => ' '
           },
-          'node_next' => {},
-          'node_prev' => {},
-          'node_up' => {}
+          'structure' => {
+            'node_next' => {},
+            'node_up' => {}
+          }
         },
-        'node_prev' => {},
         'node_up' => {}
-      },
-      'node_up' => {}
+      }
     },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 2
+          }
+        },
+        'normalized' => 'foo',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
           }
         }
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '2.1'
+              }
+            },
+            'normalized' => 'sub1',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'section',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2,
+                    'number' => '2.2'
+                  }
+                },
+                'normalized' => 'sub2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_next' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'section',
+                      'extra' => {
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 2,
+                        'number' => '2.3'
+                      }
+                    },
+                    'normalized' => 'sub3',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_next' => {},
+                    'node_prev' => {},
+                    'node_up' => {}
+                  }
+                },
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {}
       }
-    ],
-    'node_prev' => {}
+    }
   }
 };
-$result_nodes{'menutextorder'}{'menu_child'}{'node_prev'}{'node_next'} = 
$result_nodes{'menutextorder'}{'menu_child'};
-$result_nodes{'menutextorder'}{'menu_child'}{'node_prev'}{'node_up'} = 
$result_nodes{'menutextorder'};
-$result_nodes{'menutextorder'}{'menu_child'}{'node_up'} = 
$result_nodes{'menutextorder'};
-$result_nodes{'menutextorder'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}
 = $result_nodes{'menutextorder'}{'node_next'}{'menu_child'}{'node_next'};
-$result_nodes{'menutextorder'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'menutextorder'}{'node_next'}{'menu_child'}{'node_next'};
-$result_nodes{'menutextorder'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'menutextorder'}{'node_next'};
-$result_nodes{'menutextorder'}{'node_next'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'menutextorder'}{'node_next'}{'menu_child'};
-$result_nodes{'menutextorder'}{'node_next'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'menutextorder'}{'node_next'};
-$result_nodes{'menutextorder'}{'node_next'}{'menu_child'}{'node_up'} = 
$result_nodes{'menutextorder'}{'node_next'};
-$result_nodes{'menutextorder'}{'node_next'}{'node_prev'} = 
$result_nodes{'menutextorder'};
+$result_nodes{'menutextorder'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}{'structure'}{'node_next'}
 = $result_nodes{'menutextorder'}{'structure'}{'menu_child'};
+$result_nodes{'menutextorder'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}{'structure'}{'node_up'}
 = $result_nodes{'menutextorder'};
+$result_nodes{'menutextorder'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'menutextorder'};
+$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}
 = 
$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'menutextorder'}{'structure'}{'node_next'};
+$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'menutextorder'}{'structure'}{'node_next'};
+$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'menutextorder'}{'structure'}{'node_next'};
+$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'menutextorder'};
 
 $result_menus{'menutextorder'} = {
   'cmdname' => 'node',
@@ -1652,19 +1680,23 @@ $result_menus{'menutextorder'} = {
     'normalized' => 'bar',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'onesub2',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'bar' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'onesub2',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'bar' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'menutextorder'}{'menu_child'}{'menu_up'} = 
$result_menus{'menutextorder'};
+$result_menus{'menutextorder'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'menutextorder'};
 
 $result_errors{'menutextorder'} = [
   {
diff --git a/tp/t/results/sectioning/more_sections_than_nodes.pl 
b/tp/t/results/sectioning/more_sections_than_nodes.pl
index b14999437b..1663bce133 100644
--- a/tp/t/results/sectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/sectioning/more_sections_than_nodes.pl
@@ -51,7 +51,8 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -401,7 +402,8 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -577,7 +579,8 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -814,7 +817,8 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 26,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1093,7 +1097,8 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1422,7 +1427,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1450,7 +1456,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   'extra' => {
                     'normalized' => 'n-c2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1484,7 +1491,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   'extra' => {
                     'normalized' => 'n-c3',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1511,7 +1519,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
                         'extra' => {
                           'normalized' => 'n-c3-s-2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -1578,7 +1587,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
                               'extra' => {
                                 'normalized' => 'n-c3-s1-s2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1667,23 +1677,23 @@ $result_nodes{'more_sections_than_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 2
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'n-c2',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1693,95 +1703,105 @@ $result_nodes{'more_sections_than_nodes'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 3
+            'number' => 2
           }
         },
-        'normalized' => 'n-c3',
+        'normalized' => 'n-c2',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'spaces_before_argument' => ' '
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 3
+              }
             },
-            'structure' => {
-              'level' => 2,
-              'number' => '3.2'
-            }
+            'normalized' => 'n-c3',
+            'spaces_before_argument' => ' '
           },
-          'normalized' => 'n-c3-s-2',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
-      'menus' => [
-        {
-          'cmdname' => 'menu',
-          'extra' => {
-            'end_command' => {
-              'cmdname' => 'end',
+          'menus' => [
+            {
+              'cmdname' => 'menu',
               'extra' => {
-                'command_argument' => 'menu',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'menu'
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
               }
             }
-          }
-        }
-      ],
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'section',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2,
+                    'number' => '3.2'
+                  }
+                },
+                'normalized' => 'n-c3-s-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_up' => {}
+              }
             },
-            'structure' => {
-              'level' => 3,
-              'number' => '4.1.2'
-            }
-          },
-          'normalized' => 'n-c3-s1-s2',
-          'spaces_before_argument' => ' '
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '4.1.2'
+                  }
+                },
+                'normalized' => 'n-c3-s1-s2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'more_sections_than_nodes'}{'menu_child'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'more_sections_than_nodes'};
-$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'more_sections_than_nodes'};
-$result_nodes{'more_sections_than_nodes'}{'node_next'} = 
$result_nodes{'more_sections_than_nodes'}{'menu_child'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'more_sections_than_nodes'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'more_sections_than_nodes'};
+$result_nodes{'more_sections_than_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'more_sections_than_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'more_sections_than_nodes'} = {
   'cmdname' => 'node',
@@ -1789,59 +1809,69 @@ $result_menus{'more_sections_than_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'n-c2',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'n-c3',
+        'normalized' => 'n-c2',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'n-c3-s-2',
-          'spaces_before_argument' => ' '
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'n-c3' => 1
-        }
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'n-c3-s1-s2',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'n-c3',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'n-c3-s-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'n-c3' => 1
+                }
+              }
+            },
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'n-c3-s1-s2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'};
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'};
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'};
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'more_sections_than_nodes'}{'menu_child'};
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'};
-$result_menus{'more_sections_than_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'more_sections_than_nodes'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'};
+$result_menus{'more_sections_than_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'more_sections_than_nodes'};
 
 $result_errors{'more_sections_than_nodes'} = [];
 
diff --git a/tp/t/results/sectioning/next_in_menu_is_below.pl 
b/tp/t/results/sectioning/next_in_menu_is_below.pl
index d7f0a6cb47..c19422b62a 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -51,7 +51,8 @@ $result_trees{'next_in_menu_is_below'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -247,7 +248,8 @@ $result_trees{'next_in_menu_is_below'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -501,7 +503,8 @@ $result_trees{'next_in_menu_is_below'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -698,7 +701,8 @@ $result_trees{'next_in_menu_is_below'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -896,7 +900,8 @@ $result_sectioning{'next_in_menu_is_below'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -911,7 +916,8 @@ $result_sectioning{'next_in_menu_is_below'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -927,7 +933,8 @@ $result_sectioning{'next_in_menu_is_below'} = {
                         'extra' => {
                           'normalized' => 'section',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -943,7 +950,8 @@ $result_sectioning{'next_in_menu_is_below'} = {
                               'extra' => {
                                 'normalized' => 'subsection',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -992,57 +1000,38 @@ $result_nodes{'next_in_menu_is_below'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'subsection',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
-            }
-          },
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1058,51 +1047,78 @@ $result_nodes{'next_in_menu_is_below'} = {
           }
         }
       ],
-      'node_next' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'subsection',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_next' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_prev'}
 = $result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'};
-$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'};
-$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'node_next'}
 = 
$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'node_up'} 
= $result_nodes{'next_in_menu_is_below'}{'menu_child'};
-$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'node_prev'} = 
$result_nodes{'next_in_menu_is_below'};
-$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'node_up'} = 
$result_nodes{'next_in_menu_is_below'};
-$result_nodes{'next_in_menu_is_below'}{'node_next'} = 
$result_nodes{'next_in_menu_is_below'}{'menu_child'};
+$result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = 
$result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = 
$result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'};
+$result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'next_in_menu_is_below'};
+$result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'next_in_menu_is_below'};
+$result_nodes{'next_in_menu_is_below'}{'structure'}{'node_next'} = 
$result_nodes{'next_in_menu_is_below'}{'structure'}{'menu_child'};
 
 $result_menus{'next_in_menu_is_below'} = {
   'cmdname' => 'node',
@@ -1110,48 +1126,56 @@ $result_menus{'next_in_menu_is_below'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'subsection',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'subsection',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'chapter' => 1,
+                  'section' => 1
+                }
+              }
+            },
+            'menu_next' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'chapter' => 1,
-          'section' => 1
+          'Top' => 1
         }
-      },
-      'menu_next' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_prev'}
 = $result_menus{'next_in_menu_is_below'}{'menu_child'}{'menu_child'};
-$result_menus{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'next_in_menu_is_below'}{'menu_child'}{'menu_child'};
-$result_menus{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'menu_next'}
 = 
$result_menus{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'menu_up'} 
= $result_menus{'next_in_menu_is_below'}{'menu_child'};
-$result_menus{'next_in_menu_is_below'}{'menu_child'}{'menu_up'} = 
$result_menus{'next_in_menu_is_below'};
+$result_menus{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_prev'}
 = 
$result_menus{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}
 = 
$result_menus{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'next_in_menu_is_below'}{'structure'}{'menu_child'};
+$result_menus{'next_in_menu_is_below'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'next_in_menu_is_below'};
 
 $result_errors{'next_in_menu_is_below'} = [
   {
diff --git a/tp/t/results/sectioning/next_no_prev_to_node.pl 
b/tp/t/results/sectioning/next_no_prev_to_node.pl
index 26fb5ab9be..18a478e080 100644
--- a/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -231,7 +231,8 @@ $result_trees{'next_no_prev_to_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -321,7 +322,8 @@ $result_trees{'next_no_prev_to_node'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -391,7 +393,8 @@ $result_trees{'next_no_prev_to_node'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -481,23 +484,6 @@ $result_nodes{'next_no_prev_to_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'no-return',
-        'spaces_before_argument' => ' '
-      },
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -513,12 +499,35 @@ $result_nodes{'next_no_prev_to_node'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'no-return',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'next_no_prev_to_node'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'next_no_prev_to_node'};
-$result_nodes{'next_no_prev_to_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'next_no_prev_to_node'};
-$result_nodes{'next_no_prev_to_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'next_no_prev_to_node'};
-$result_nodes{'next_no_prev_to_node'}{'node_next'} = 
$result_nodes{'next_no_prev_to_node'}{'menu_child'};
+$result_nodes{'next_no_prev_to_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'next_no_prev_to_node'};
+$result_nodes{'next_no_prev_to_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'next_no_prev_to_node'};
+$result_nodes{'next_no_prev_to_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'next_no_prev_to_node'};
+$result_nodes{'next_no_prev_to_node'}{'structure'}{'node_next'} = 
$result_nodes{'next_no_prev_to_node'}{'structure'}{'menu_child'};
 
 $result_menus{'next_no_prev_to_node'} = {
   'cmdname' => 'node',
@@ -526,33 +535,39 @@ $result_menus{'next_no_prev_to_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'no-return',
+        'normalized' => 'first-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'no-return',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'next_no_prev_to_node'}{'menu_child'}{'menu_next'}{'menu_prev'} 
= $result_menus{'next_no_prev_to_node'}{'menu_child'};
-$result_menus{'next_no_prev_to_node'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'next_no_prev_to_node'};
-$result_menus{'next_no_prev_to_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'next_no_prev_to_node'};
+$result_menus{'next_no_prev_to_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'next_no_prev_to_node'}{'structure'}{'menu_child'};
+$result_menus{'next_no_prev_to_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'next_no_prev_to_node'};
+$result_menus{'next_no_prev_to_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'next_no_prev_to_node'};
 
 $result_errors{'next_no_prev_to_node'} = [];
 
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index e17454123e..14d49c94ac 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -51,7 +51,8 @@ $result_trees{'no_menu'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -124,7 +125,8 @@ $result_trees{'no_menu'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -205,7 +207,8 @@ $result_trees{'no_menu'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -286,7 +289,8 @@ $result_trees{'no_menu'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -397,7 +401,8 @@ $result_sectioning{'no_menu'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -411,7 +416,8 @@ $result_sectioning{'no_menu'} = {
                   'extra' => {
                     'normalized' => 'c1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -431,7 +437,8 @@ $result_sectioning{'no_menu'} = {
                   'extra' => {
                     'normalized' => 'c2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -452,7 +459,8 @@ $result_sectioning{'no_menu'} = {
                   'extra' => {
                     'normalized' => 'c3',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -498,22 +506,7 @@ $result_nodes{'no_menu'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'c1',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
@@ -524,51 +517,75 @@ $result_nodes{'no_menu'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'c2',
+        'normalized' => 'c1',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
             },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
+            'normalized' => 'c2',
+            'spaces_before_argument' => ' '
           },
-          'normalized' => 'c3',
-          'spaces_before_argument' => ' '
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 3
+                  }
+                },
+                'normalized' => 'c3',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'no_menu'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'} = 
$result_nodes{'no_menu'}{'node_next'}{'node_next'};
-$result_nodes{'no_menu'}{'node_next'}{'node_next'}{'node_next'}{'node_up'} = 
$result_nodes{'no_menu'};
-$result_nodes{'no_menu'}{'node_next'}{'node_next'}{'node_prev'} = 
$result_nodes{'no_menu'}{'node_next'};
-$result_nodes{'no_menu'}{'node_next'}{'node_next'}{'node_up'} = 
$result_nodes{'no_menu'};
-$result_nodes{'no_menu'}{'node_next'}{'node_prev'} = $result_nodes{'no_menu'};
-$result_nodes{'no_menu'}{'node_next'}{'node_up'} = $result_nodes{'no_menu'};
+$result_nodes{'no_menu'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'no_menu'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'no_menu'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'no_menu'};
+$result_nodes{'no_menu'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'no_menu'}{'structure'}{'node_next'};
+$result_nodes{'no_menu'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'no_menu'};
+$result_nodes{'no_menu'}{'structure'}{'node_next'}{'structure'}{'node_prev'} = 
$result_nodes{'no_menu'};
+$result_nodes{'no_menu'}{'structure'}{'node_next'}{'structure'}{'node_up'} = 
$result_nodes{'no_menu'};
 
 $result_menus{'no_menu'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'no_menu'} = [];
diff --git a/tp/t/results/sectioning/node_empty_direction.pl 
b/tp/t/results/sectioning/node_empty_direction.pl
index cdf28a41c3..4a66d0a44e 100644
--- a/tp/t/results/sectioning/node_empty_direction.pl
+++ b/tp/t/results/sectioning/node_empty_direction.pl
@@ -56,7 +56,8 @@ $result_trees{'node_empty_direction'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -79,7 +80,8 @@ $result_nodes{'node_empty_direction'} = {
   'extra' => {
     'normalized' => 'name',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'node_empty_direction'} = {
@@ -87,7 +89,8 @@ $result_menus{'node_empty_direction'} = {
   'extra' => {
     'normalized' => 'name',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_empty_direction'} = [];
diff --git a/tp/t/results/sectioning/node_line_arguments.pl 
b/tp/t/results/sectioning/node_line_arguments.pl
index 48f0621f1e..4c3f0ebf14 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -58,7 +58,8 @@ $result_trees{'node_line_arguments'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -116,7 +117,8 @@ $result_trees{'node_line_arguments'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -193,7 +195,8 @@ $result_trees{'node_line_arguments'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -289,7 +292,8 @@ $result_trees{'node_line_arguments'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -392,7 +396,8 @@ $result_trees{'node_line_arguments'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -457,7 +462,8 @@ $result_trees{'node_line_arguments'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -617,7 +623,8 @@ $result_trees{'node_line_arguments'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -735,7 +742,8 @@ $result_nodes{'node_line_arguments'} = {
   'extra' => {
     'normalized' => 'one-arg1',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'node_line_arguments'} = {
@@ -743,7 +751,8 @@ $result_menus{'node_line_arguments'} = {
   'extra' => {
     'normalized' => 'one-arg1',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_line_arguments'} = [
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index 02d9ac7e4b..0adf52234c 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -426,7 +426,8 @@ $result_trees{'node_nested_parentheses'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -529,15 +530,6 @@ $result_nodes{'node_nested_parentheses'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => '(some) file'
-        }
-      ]
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -553,9 +545,20 @@ $result_nodes{'node_nested_parentheses'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => '(some) file'
+          }
+        ]
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'node_nested_parentheses'}{'node_next'} = 
$result_nodes{'node_nested_parentheses'}{'menu_child'};
+$result_nodes{'node_nested_parentheses'}{'structure'}{'node_next'} = 
$result_nodes{'node_nested_parentheses'}{'structure'}{'menu_child'};
 
 $result_menus{'node_nested_parentheses'} = {
   'cmdname' => 'node',
@@ -563,13 +566,15 @@ $result_menus{'node_nested_parentheses'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => '(some) file'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => '(some) file'
+          }
+        ]
+      }
     }
   }
 };
diff --git a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl 
b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
index 02f3605303..3a83988a79 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -52,7 +52,8 @@ $result_trees{'node_part_chapter_after_chapter'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -323,7 +324,8 @@ $result_trees{'node_part_chapter_after_chapter'} = [
           'line_nr' => 9,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -417,7 +419,8 @@ $result_trees{'node_part_chapter_after_chapter'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -655,7 +658,8 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -670,7 +674,8 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                   'extra' => {
                     'normalized' => 'chapter-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -697,7 +702,8 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                 'extra' => {
                   'normalized' => 'part-chapter-node',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -751,75 +757,81 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {
-            'associated_part' => {
-              'cmdname' => 'part',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
               'extra' => {
+                'associated_part' => {
+                  'cmdname' => 'part',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 0
+                  }
+                },
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 0
+                'level' => 1,
+                'number' => 2
               }
             },
+            'normalized' => 'part-chapter-node',
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 1,
-            'number' => 2
+            'node_prev' => {},
+            'node_up' => {}
           }
         },
-        'normalized' => 'part-chapter-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'node_part_chapter_after_chapter'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'node_part_chapter_after_chapter'}{'menu_child'};
-$result_nodes{'node_part_chapter_after_chapter'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'node_part_chapter_after_chapter'};
-$result_nodes{'node_part_chapter_after_chapter'}{'menu_child'}{'node_prev'} = 
$result_nodes{'node_part_chapter_after_chapter'};
-$result_nodes{'node_part_chapter_after_chapter'}{'menu_child'}{'node_up'} = 
$result_nodes{'node_part_chapter_after_chapter'};
-$result_nodes{'node_part_chapter_after_chapter'}{'node_next'} = 
$result_nodes{'node_part_chapter_after_chapter'}{'menu_child'};
+$result_nodes{'node_part_chapter_after_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'node_part_chapter_after_chapter'}{'structure'}{'menu_child'};
+$result_nodes{'node_part_chapter_after_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'node_part_chapter_after_chapter'};
+$result_nodes{'node_part_chapter_after_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'node_part_chapter_after_chapter'};
+$result_nodes{'node_part_chapter_after_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'node_part_chapter_after_chapter'};
+$result_nodes{'node_part_chapter_after_chapter'}{'structure'}{'node_next'} = 
$result_nodes{'node_part_chapter_after_chapter'}{'structure'}{'menu_child'};
 
 $result_menus{'node_part_chapter_after_chapter'} = {
   'cmdname' => 'node',
@@ -827,33 +839,39 @@ $result_menus{'node_part_chapter_after_chapter'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'part-chapter-node',
+        'normalized' => 'chapter-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'part-chapter-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'node_part_chapter_after_chapter'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'node_part_chapter_after_chapter'}{'menu_child'};
-$result_menus{'node_part_chapter_after_chapter'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'node_part_chapter_after_chapter'};
-$result_menus{'node_part_chapter_after_chapter'}{'menu_child'}{'menu_up'} = 
$result_menus{'node_part_chapter_after_chapter'};
+$result_menus{'node_part_chapter_after_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'node_part_chapter_after_chapter'}{'structure'}{'menu_child'};
+$result_menus{'node_part_chapter_after_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'node_part_chapter_after_chapter'};
+$result_menus{'node_part_chapter_after_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'node_part_chapter_after_chapter'};
 
 $result_errors{'node_part_chapter_after_chapter'} = [
   {
@@ -880,27 +898,33 @@ $result_elements{'node_part_chapter_after_chapter'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'chapter-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'part-chapter-node',
+              'normalized' => 'chapter-node',
               'spaces_before_argument' => ' '
             },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'part-chapter-node',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
+              },
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -996,15 +1020,15 @@ $result_elements{'node_part_chapter_after_chapter'} = [
   {},
   {}
 ];
-$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'};
-$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'};
+$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'};
+$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'unit_command'} 
= $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'section'};
-$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'node_part_chapter_after_chapter'}[0];
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'node_part_chapter_after_chapter'}[0];
-$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
+$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'structure'}{'directions'}{'FastForward'};
diff --git a/tp/t/results/sectioning/node_part_chapter_after_top.pl 
b/tp/t/results/sectioning/node_part_chapter_after_top.pl
index 804d493a9b..1fc965d44f 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -52,7 +52,8 @@ $result_trees{'node_part_chapter_after_top'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -259,7 +260,8 @@ $result_trees{'node_part_chapter_after_top'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -433,7 +435,8 @@ $result_sectioning{'node_part_chapter_after_top'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -453,7 +456,8 @@ $result_sectioning{'node_part_chapter_after_top'} = {
                 'extra' => {
                   'normalized' => 'chapter-node',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -504,34 +508,6 @@ $result_nodes{'node_part_chapter_after_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'associated_part' => {
-            'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 0
-            }
-          },
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -547,11 +523,43 @@ $result_nodes{'node_part_chapter_after_top'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'associated_part' => {
+              'cmdname' => 'part',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 0
+              }
+            },
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'node_part_chapter_after_top'}{'menu_child'}{'node_prev'} = 
$result_nodes{'node_part_chapter_after_top'};
-$result_nodes{'node_part_chapter_after_top'}{'menu_child'}{'node_up'} = 
$result_nodes{'node_part_chapter_after_top'};
-$result_nodes{'node_part_chapter_after_top'}{'node_next'} = 
$result_nodes{'node_part_chapter_after_top'}{'menu_child'};
+$result_nodes{'node_part_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'node_part_chapter_after_top'};
+$result_nodes{'node_part_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'node_part_chapter_after_top'};
+$result_nodes{'node_part_chapter_after_top'}{'structure'}{'node_next'} = 
$result_nodes{'node_part_chapter_after_top'}{'structure'}{'menu_child'};
 
 $result_menus{'node_part_chapter_after_top'} = {
   'cmdname' => 'node',
@@ -559,19 +567,23 @@ $result_menus{'node_part_chapter_after_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'node_part_chapter_after_top'}{'menu_child'}{'menu_up'} = 
$result_menus{'node_part_chapter_after_top'};
+$result_menus{'node_part_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'node_part_chapter_after_top'};
 
 $result_errors{'node_part_chapter_after_top'} = [
   {
@@ -598,15 +610,19 @@ $result_elements{'node_part_chapter_after_top'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'chapter-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'chapter-node',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -670,9 +686,9 @@ $result_elements{'node_part_chapter_after_top'} = [
   },
   {}
 ];
-$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'node'};
+$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'node'};
 $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'section'};
-$result_elements{'node_part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'node_part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'node_part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'node_part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'node_part_chapter_after_top'}[0];
 
$result_elements{'node_part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'node_part_chapter_after_top'}[0];
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl 
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index 5f8729b871..0fc2961cdc 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -210,7 +210,8 @@ $result_trees{'node_referenced_in_ref'} = {
                     'line_nr' => 11,
                     'macro' => ''
                   },
-                  'parent' => {}
+                  'parent' => {},
+                  'structure' => {}
                 },
                 'node_argument' => {
                   'node_content' => [
@@ -262,7 +263,8 @@ $result_trees{'node_referenced_in_ref'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -310,7 +312,8 @@ $result_trees{'node_referenced_in_ref'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {}
   ],
@@ -389,15 +392,6 @@ $result_nodes{'node_referenced_in_ref'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first-level-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -413,11 +407,24 @@ $result_nodes{'node_referenced_in_ref'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first-level-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'node_referenced_in_ref'}{'menu_child'}{'node_prev'} = 
$result_nodes{'node_referenced_in_ref'};
-$result_nodes{'node_referenced_in_ref'}{'menu_child'}{'node_up'} = 
$result_nodes{'node_referenced_in_ref'};
-$result_nodes{'node_referenced_in_ref'}{'node_next'} = 
$result_nodes{'node_referenced_in_ref'}{'menu_child'};
+$result_nodes{'node_referenced_in_ref'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'node_referenced_in_ref'};
+$result_nodes{'node_referenced_in_ref'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'node_referenced_in_ref'};
+$result_nodes{'node_referenced_in_ref'}{'structure'}{'node_next'} = 
$result_nodes{'node_referenced_in_ref'}{'structure'}{'menu_child'};
 
 $result_menus{'node_referenced_in_ref'} = {
   'cmdname' => 'node',
@@ -425,19 +432,23 @@ $result_menus{'node_referenced_in_ref'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first-level-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first-level-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'node_referenced_in_ref'}{'menu_child'}{'menu_up'} = 
$result_menus{'node_referenced_in_ref'};
+$result_menus{'node_referenced_in_ref'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'node_referenced_in_ref'};
 
 $result_errors{'node_referenced_in_ref'} = [];
 
diff --git a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
index a1050c3203..6898bf4c13 100644
--- a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
@@ -87,7 +87,8 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -211,7 +212,8 @@ $result_sectioning{'node_sectop_before_chapter_no_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -257,7 +259,8 @@ $result_nodes{'node_sectop_before_chapter_no_node'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'node_sectop_before_chapter_no_node'} = {
@@ -265,7 +268,8 @@ $result_menus{'node_sectop_before_chapter_no_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_sectop_before_chapter_no_node'} = [];
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index e2200721f2..a349ca2551 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -87,7 +87,8 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -208,7 +209,8 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -249,7 +251,8 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -388,7 +391,8 @@ $result_sectioning{'node_sectop_before_lone_node_Top'} = {
             'extra' => {
               'normalized' => 'node-before',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -403,7 +407,8 @@ $result_sectioning{'node_sectop_before_lone_node_Top'} = {
                   'extra' => {
                     'normalized' => 'chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -433,51 +438,58 @@ $result_nodes{'node_sectop_before_lone_node_Top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 0
-        }
-      },
-      'normalized' => 'node-before',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'chapter',
+          'cmdname' => 'top',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'level' => 0
           }
         },
-        'normalized' => 'chap',
+        'normalized' => 'node-before',
         'spaces_before_argument' => ' '
       },
-      'node_up' => {}
-    },
-    'node_prev' => {}
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 1
+              }
+            },
+            'normalized' => 'chap',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {}
+      }
+    }
   }
 };
-$result_nodes{'node_sectop_before_lone_node_Top'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'node_sectop_before_lone_node_Top'}{'node_next'};
-$result_nodes{'node_sectop_before_lone_node_Top'}{'node_next'}{'node_prev'} = 
$result_nodes{'node_sectop_before_lone_node_Top'};
+$result_nodes{'node_sectop_before_lone_node_Top'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'node_sectop_before_lone_node_Top'}{'structure'}{'node_next'};
+$result_nodes{'node_sectop_before_lone_node_Top'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'node_sectop_before_lone_node_Top'};
 
 $result_menus{'node_sectop_before_lone_node_Top'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_sectop_before_lone_node_Top'} = [];
diff --git a/tp/t/results/sectioning/node_too_much_args.pl 
b/tp/t/results/sectioning/node_too_much_args.pl
index fcc9409abd..b2f21d8e84 100644
--- a/tp/t/results/sectioning/node_too_much_args.pl
+++ b/tp/t/results/sectioning/node_too_much_args.pl
@@ -91,7 +91,8 @@ $result_trees{'node_too_much_args'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -121,13 +122,15 @@ $result_nodes{'node_too_much_args'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
+  'structure' => {
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
     }
   }
 };
@@ -137,7 +140,8 @@ $result_menus{'node_too_much_args'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_too_much_args'} = [
diff --git a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl 
b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
index 5d59d437d2..45d6104afb 100644
--- a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
+++ b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
@@ -94,7 +94,8 @@ $result_trees{'node_up_direction_for_top_with_manual'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -127,14 +128,17 @@ $result_nodes{'node_up_direction_for_top_with_manual'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ],
-      'normalized' => 'Top'
+  'structure' => {
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'structure' => {}
     }
   }
 };
@@ -144,7 +148,8 @@ $result_menus{'node_up_direction_for_top_with_manual'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_up_direction_for_top_with_manual'} = [];
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index 636f515e61..4a27bf421a 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -175,7 +175,8 @@ $result_trees{'node_up_external_node'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -303,7 +304,8 @@ $result_trees{'node_up_external_node'} = [
           'line_nr' => 7,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -388,40 +390,6 @@ $result_nodes{'node_up_external_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'manual1'
-          }
-        ]
-      }
-    },
-    'node_prev' => {
-      'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'manual2'
-          }
-        ]
-      }
-    },
-    'node_up' => {
-      'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'manual3'
-          }
-        ]
-      }
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -437,9 +405,47 @@ $result_nodes{'node_up_external_node'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'manual1'
+              }
+            ]
+          }
+        },
+        'node_prev' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'manual2'
+              }
+            ]
+          }
+        },
+        'node_up' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'manual3'
+              }
+            ]
+          }
+        }
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'node_up_external_node'}{'node_next'} = 
$result_nodes{'node_up_external_node'}{'menu_child'};
+$result_nodes{'node_up_external_node'}{'structure'}{'node_next'} = 
$result_nodes{'node_up_external_node'}{'structure'}{'menu_child'};
 
 $result_menus{'node_up_external_node'} = {
   'cmdname' => 'node',
@@ -447,19 +453,23 @@ $result_menus{'node_up_external_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'node_up_external_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'node_up_external_node'};
+$result_menus{'node_up_external_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'node_up_external_node'};
 
 $result_errors{'node_up_external_node'} = [];
 
@@ -476,15 +486,19 @@ $result_elements{'node_up_external_node'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'first',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'first',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -551,10 +565,10 @@ $result_elements{'node_up_external_node'} = [
   },
   {}
 ];
-$result_elements{'node_up_external_node'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'node_up_external_node'}[0]{'extra'}{'node'};
+$result_elements{'node_up_external_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'node_up_external_node'}[0]{'extra'}{'node'};
 $result_elements{'node_up_external_node'}[0]{'extra'}{'unit_command'} = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'node'};
-$result_elements{'node_up_external_node'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = $result_elements{'node_up_external_node'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'node_up_external_node'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = $result_elements{'node_up_external_node'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'node_up_external_node'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'node_up_external_node'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'node_up_external_node'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'node_up_external_node'}[0];
 
$result_elements{'node_up_external_node'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = $result_elements{'node_up_external_node'}[0];
 
$result_elements{'node_up_external_node'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeNext'}{'extra'}{'manual_content'}
 = 
$result_elements{'node_up_external_node'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeForward'}{'extra'}{'manual_content'};
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index 833a2f7fda..3339c171b6 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -51,7 +51,8 @@ $result_trees{'nodename_parentheses'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -376,7 +377,8 @@ $result_trees{'nodename_parentheses'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -474,7 +476,8 @@ $result_trees{'nodename_parentheses'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -687,7 +690,8 @@ $result_trees{'nodename_parentheses'} = {
         'line_nr' => 22,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -998,7 +1002,8 @@ $result_sectioning{'nodename_parentheses'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1013,7 +1018,8 @@ $result_sectioning{'nodename_parentheses'} = {
                   'extra' => {
                     'normalized' => 'Node-_0028with-parentheses_0029',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1033,7 +1039,8 @@ $result_sectioning{'nodename_parentheses'} = {
                   'extra' => {
                     'normalized' => 'Other-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1054,7 +1061,8 @@ $result_sectioning{'nodename_parentheses'} = {
                   'extra' => {
                     'normalized' => 'node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1102,23 +1110,23 @@ $result_nodes{'nodename_parentheses'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'Node-_0028with-parentheses_0029',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
@@ -1128,61 +1136,69 @@ $result_nodes{'nodename_parentheses'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'Other-node',
+        'normalized' => 'Node-_0028with-parentheses_0029',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
             },
-            'structure' => {
-              'level' => 1,
-              'number' => 3
-            }
+            'normalized' => 'Other-node',
+            'spaces_before_argument' => ' '
           },
-          'normalized' => 'node',
-          'spaces_before_argument' => ' '
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 3
+                  }
+                },
+                'normalized' => 'node',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodename_parentheses'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'nodename_parentheses'}{'menu_child'}{'node_next'};
-$result_nodes{'nodename_parentheses'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'nodename_parentheses'};
-$result_nodes{'nodename_parentheses'}{'menu_child'}{'node_next'}{'node_prev'} 
= $result_nodes{'nodename_parentheses'}{'menu_child'};
-$result_nodes{'nodename_parentheses'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'nodename_parentheses'};
-$result_nodes{'nodename_parentheses'}{'menu_child'}{'node_prev'} = 
$result_nodes{'nodename_parentheses'};
-$result_nodes{'nodename_parentheses'}{'menu_child'}{'node_up'} = 
$result_nodes{'nodename_parentheses'};
-$result_nodes{'nodename_parentheses'}{'node_next'} = 
$result_nodes{'nodename_parentheses'}{'menu_child'};
+$result_nodes{'nodename_parentheses'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodename_parentheses'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'nodename_parentheses'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodename_parentheses'};
+$result_nodes{'nodename_parentheses'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'nodename_parentheses'}{'structure'}{'menu_child'};
+$result_nodes{'nodename_parentheses'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodename_parentheses'};
+$result_nodes{'nodename_parentheses'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodename_parentheses'};
+$result_nodes{'nodename_parentheses'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodename_parentheses'};
+$result_nodes{'nodename_parentheses'}{'structure'}{'node_next'} = 
$result_nodes{'nodename_parentheses'}{'structure'}{'menu_child'};
 
 $result_menus{'nodename_parentheses'} = {
   'cmdname' => 'node',
@@ -1190,43 +1206,49 @@ $result_menus{'nodename_parentheses'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Node-_0028with-parentheses_0029',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Other-node',
+        'normalized' => 'Node-_0028with-parentheses_0029',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'extra' => {
-          'manual_content' => [
-            {
-              'text' => 'manual'
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Other-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_next' => {
+              'extra' => {
+                'manual_content' => [
+                  {
+                    'text' => 'manual'
+                  }
+                ],
+                'normalized' => 'node'
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
             }
-          ],
-          'normalized' => 'node'
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodename_parentheses'}{'menu_child'}{'menu_next'}{'menu_prev'} 
= $result_menus{'nodename_parentheses'}{'menu_child'};
-$result_menus{'nodename_parentheses'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'nodename_parentheses'};
-$result_menus{'nodename_parentheses'}{'menu_child'}{'menu_up'} = 
$result_menus{'nodename_parentheses'};
+$result_menus{'nodename_parentheses'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'nodename_parentheses'}{'structure'}{'menu_child'};
+$result_menus{'nodename_parentheses'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodename_parentheses'};
+$result_menus{'nodename_parentheses'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodename_parentheses'};
 
 $result_errors{'nodename_parentheses'} = [
   {
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index 1907e60b65..cb9f03d8e8 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
@@ -237,7 +237,8 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -363,7 +364,8 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -454,7 +456,8 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -619,7 +622,8 @@ $result_sectioning{'nodes_after_top_before_chapter_nodes'} 
= {
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -640,34 +644,6 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 1,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -683,13 +659,47 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_nodes'};
-$result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_nodes'};
-$result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'node_up'} 
= $result_nodes{'nodes_after_top_before_chapter_nodes'};
-$result_nodes{'nodes_after_top_before_chapter_nodes'}{'node_next'} = 
$result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_chapter_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_nodes'};
+$result_nodes{'nodes_after_top_before_chapter_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_nodes'};
+$result_nodes{'nodes_after_top_before_chapter_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_nodes'};
+$result_nodes{'nodes_after_top_before_chapter_nodes'}{'structure'}{'node_next'}
 = 
$result_nodes{'nodes_after_top_before_chapter_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'nodes_after_top_before_chapter_nodes'} = {
   'cmdname' => 'node',
@@ -697,33 +707,39 @@ $result_menus{'nodes_after_top_before_chapter_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'nodes_after_top_before_chapter_nodes'}{'menu_child'};
-$result_menus{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_nodes'};
-$result_menus{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'menu_up'} 
= $result_menus{'nodes_after_top_before_chapter_nodes'};
+$result_menus{'nodes_after_top_before_chapter_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_chapter_nodes'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_chapter_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_nodes'};
+$result_menus{'nodes_after_top_before_chapter_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_nodes'};
 
 $result_errors{'nodes_after_top_before_chapter_nodes'} = [];
 
@@ -740,27 +756,33 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} 
= [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'second-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
+              'normalized' => 'second-node',
               'spaces_before_argument' => ' '
             },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'third-node',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
+              },
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -822,15 +844,15 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} 
= [
   {},
   {}
 ];
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'unit_command'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0];
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodePrev'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'structure'}{'directions'}{'Forward'};
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
index f14ae4ca23..4d28a82144 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
@@ -236,7 +236,8 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -352,7 +353,8 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -431,7 +433,8 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -578,7 +581,8 @@ 
$result_sectioning{'nodes_after_top_before_chapter_not_split'} = {
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -599,34 +603,6 @@ $result_nodes{'nodes_after_top_before_chapter_not_split'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 1,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -642,13 +618,47 @@ $result_nodes{'nodes_after_top_before_chapter_not_split'} 
= {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_chapter_not_split'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_not_split'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter_not_split'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_not_split'};
-$result_nodes{'nodes_after_top_before_chapter_not_split'}{'menu_child'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_not_split'};
-$result_nodes{'nodes_after_top_before_chapter_not_split'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_not_split'};
-$result_nodes{'nodes_after_top_before_chapter_not_split'}{'node_next'} = 
$result_nodes{'nodes_after_top_before_chapter_not_split'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_not_split'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_not_split'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_not_split'};
+$result_nodes{'nodes_after_top_before_chapter_not_split'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_not_split'};
+$result_nodes{'nodes_after_top_before_chapter_not_split'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_not_split'};
+$result_nodes{'nodes_after_top_before_chapter_not_split'}{'structure'}{'node_next'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split'}{'structure'}{'menu_child'};
 
 $result_menus{'nodes_after_top_before_chapter_not_split'} = {
   'cmdname' => 'node',
@@ -656,33 +666,39 @@ $result_menus{'nodes_after_top_before_chapter_not_split'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_chapter_not_split'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'nodes_after_top_before_chapter_not_split'}{'menu_child'};
-$result_menus{'nodes_after_top_before_chapter_not_split'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_not_split'};
-$result_menus{'nodes_after_top_before_chapter_not_split'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_not_split'};
+$result_menus{'nodes_after_top_before_chapter_not_split'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_chapter_not_split'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_chapter_not_split'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_not_split'};
+$result_menus{'nodes_after_top_before_chapter_not_split'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_not_split'};
 
 $result_errors{'nodes_after_top_before_chapter_not_split'} = [];
 
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
index b6f904b715..fd110c1905 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
@@ -236,7 +236,8 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -352,7 +353,8 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -431,7 +433,8 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -578,7 +581,8 @@ 
$result_sectioning{'nodes_after_top_before_chapter_not_split_no_use_node_directi
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -599,34 +603,6 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 1,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -642,13 +618,47 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
-$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'menu_child'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
-$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
-$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'node_next'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
+$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
+$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
+$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'node_next'}
 = 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'menu_child'};
 
 
$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
 = {
   'cmdname' => 'node',
@@ -656,33 +666,39 @@ 
$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'menu_child'};
-$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
-$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
+$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
+$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
 
 
$result_errors{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
 = [];
 
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
index 8c4807a019..0a83025eb3 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
@@ -237,7 +237,8 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -353,7 +354,8 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -432,7 +434,8 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -589,7 +592,8 @@ 
$result_sectioning{'nodes_after_top_before_chapter_sections'} = {
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -610,34 +614,6 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} = 
{
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 1,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -653,13 +629,47 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} 
= {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_sections'};
-$result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_sections'};
-$result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_sections'};
-$result_nodes{'nodes_after_top_before_chapter_sections'}{'node_next'} = 
$result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_sections'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_chapter_sections'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_sections'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_sections'};
+$result_nodes{'nodes_after_top_before_chapter_sections'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_chapter_sections'};
+$result_nodes{'nodes_after_top_before_chapter_sections'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_chapter_sections'};
+$result_nodes{'nodes_after_top_before_chapter_sections'}{'structure'}{'node_next'}
 = 
$result_nodes{'nodes_after_top_before_chapter_sections'}{'structure'}{'menu_child'};
 
 $result_menus{'nodes_after_top_before_chapter_sections'} = {
   'cmdname' => 'node',
@@ -667,33 +677,39 @@ $result_menus{'nodes_after_top_before_chapter_sections'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'nodes_after_top_before_chapter_sections'}{'menu_child'};
-$result_menus{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_sections'};
-$result_menus{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_sections'};
+$result_menus{'nodes_after_top_before_chapter_sections'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_chapter_sections'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_chapter_sections'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_sections'};
+$result_menus{'nodes_after_top_before_chapter_sections'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_chapter_sections'};
 
 $result_errors{'nodes_after_top_before_chapter_sections'} = [];
 
@@ -710,28 +726,34 @@ 
$result_elements{'nodes_after_top_before_chapter_sections'} = [
           'normalized' => 'third-node',
           'spaces_before_argument' => ' '
         },
-        'menu_prev' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'second-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {},
-          'menu_up' => {
+        'structure' => {
+          'menu_prev' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
+              'normalized' => 'second-node',
               'spaces_before_argument' => ' '
             },
-            'menu_child' => {}
+            'structure' => {
+              'menu_next' => {},
+              'menu_up' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'Top',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_child' => {}
+                }
+              },
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           },
+          'menu_up' => {},
           'menu_up_hash' => {
             'Top' => 1
           }
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'Top' => 1
         }
       },
       'section' => {
@@ -756,9 +778,9 @@ $result_elements{'nodes_after_top_before_chapter_sections'} 
= [
     'type' => 'unit'
   }
 ];
-$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'};
-$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'menu_prev'};
-$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_up'};
+$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'structure'}{'menu_prev'}{'structure'}{'menu_next'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'};
+$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'structure'}{'menu_prev'}{'structure'}{'menu_up'}{'structure'}{'menu_child'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'structure'}{'menu_prev'};
+$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'structure'}{'menu_up'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'structure'}{'menu_prev'}{'structure'}{'menu_up'};
 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'section'};
 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'structure'}{'directions'}{'NodePrev'}
 = $result_elements{'nodes_after_top_before_chapter_sections'}[0];
 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'structure'}{'directions'}{'NodeUp'}
 = $result_elements{'nodes_after_top_before_chapter_sections'}[0];
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
index ac764f8545..83d3528f80 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
@@ -237,7 +237,8 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -363,7 +364,8 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -454,7 +456,8 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -619,7 +622,8 @@ $result_sectioning{'nodes_after_top_before_section_nodes'} 
= {
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -640,34 +644,6 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'subsection',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 3,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -683,13 +659,47 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'subsection',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 3,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_nodes'};
-$result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_nodes'};
-$result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'}{'node_up'} 
= $result_nodes{'nodes_after_top_before_section_nodes'};
-$result_nodes{'nodes_after_top_before_section_nodes'}{'node_next'} = 
$result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_section_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_nodes'};
+$result_nodes{'nodes_after_top_before_section_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_nodes'};
+$result_nodes{'nodes_after_top_before_section_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_nodes'};
+$result_nodes{'nodes_after_top_before_section_nodes'}{'structure'}{'node_next'}
 = 
$result_nodes{'nodes_after_top_before_section_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'nodes_after_top_before_section_nodes'} = {
   'cmdname' => 'node',
@@ -697,33 +707,39 @@ $result_menus{'nodes_after_top_before_section_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_section_nodes'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'nodes_after_top_before_section_nodes'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section_nodes'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_nodes'};
-$result_menus{'nodes_after_top_before_section_nodes'}{'menu_child'}{'menu_up'} 
= $result_menus{'nodes_after_top_before_section_nodes'};
+$result_menus{'nodes_after_top_before_section_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_section_nodes'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_section_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_nodes'};
+$result_menus{'nodes_after_top_before_section_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_nodes'};
 
 $result_errors{'nodes_after_top_before_section_nodes'} = [];
 
@@ -740,27 +756,33 @@ $result_elements{'nodes_after_top_before_section_nodes'} 
= [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'second-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
+              'normalized' => 'second-node',
               'spaces_before_argument' => ' '
             },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'third-node',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
+              },
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -823,15 +845,15 @@ $result_elements{'nodes_after_top_before_section_nodes'} 
= [
   {},
   {}
 ];
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'unit_command'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0];
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodePrev'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'structure'}{'directions'}{'Forward'};
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
index c0576f93b0..2b0f17d7d6 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
@@ -237,7 +237,8 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -353,7 +354,8 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -432,7 +434,8 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -589,7 +592,8 @@ 
$result_sectioning{'nodes_after_top_before_section_sections'} = {
             'extra' => {
               'normalized' => 'third-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -610,34 +614,6 @@ $result_nodes{'nodes_after_top_before_section_sections'} = 
{
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'subsection',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 3,
-            'number' => 1
-          }
-        },
-        'normalized' => 'third-node',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -653,13 +629,47 @@ $result_nodes{'nodes_after_top_before_section_sections'} 
= {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'subsection',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 3,
+                'number' => 1
+              }
+            },
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_sections'};
-$result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_sections'};
-$result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_sections'};
-$result_nodes{'nodes_after_top_before_section_sections'}{'node_next'} = 
$result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_sections'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'nodes_after_top_before_section_sections'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_sections'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_sections'};
+$result_nodes{'nodes_after_top_before_section_sections'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_after_top_before_section_sections'};
+$result_nodes{'nodes_after_top_before_section_sections'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_after_top_before_section_sections'};
+$result_nodes{'nodes_after_top_before_section_sections'}{'structure'}{'node_next'}
 = 
$result_nodes{'nodes_after_top_before_section_sections'}{'structure'}{'menu_child'};
 
 $result_menus{'nodes_after_top_before_section_sections'} = {
   'cmdname' => 'node',
@@ -667,33 +677,39 @@ $result_menus{'nodes_after_top_before_section_sections'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'third-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'third-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'nodes_after_top_before_section_sections'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'nodes_after_top_before_section_sections'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section_sections'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_sections'};
-$result_menus{'nodes_after_top_before_section_sections'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_sections'};
+$result_menus{'nodes_after_top_before_section_sections'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'nodes_after_top_before_section_sections'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_section_sections'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_sections'};
+$result_menus{'nodes_after_top_before_section_sections'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_after_top_before_section_sections'};
 
 $result_errors{'nodes_after_top_before_section_sections'} = [];
 
@@ -710,28 +726,34 @@ 
$result_elements{'nodes_after_top_before_section_sections'} = [
           'normalized' => 'third-node',
           'spaces_before_argument' => ' '
         },
-        'menu_prev' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'second-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {},
-          'menu_up' => {
+        'structure' => {
+          'menu_prev' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
+              'normalized' => 'second-node',
               'spaces_before_argument' => ' '
             },
-            'menu_child' => {}
+            'structure' => {
+              'menu_next' => {},
+              'menu_up' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'Top',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_child' => {}
+                }
+              },
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           },
+          'menu_up' => {},
           'menu_up_hash' => {
             'Top' => 1
           }
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'Top' => 1
         }
       },
       'section' => {
@@ -757,9 +779,9 @@ $result_elements{'nodes_after_top_before_section_sections'} 
= [
     'type' => 'unit'
   }
 ];
-$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'};
-$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'menu_prev'};
-$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_up'};
+$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'structure'}{'menu_prev'}{'structure'}{'menu_next'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'};
+$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'structure'}{'menu_prev'}{'structure'}{'menu_up'}{'structure'}{'menu_child'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'structure'}{'menu_prev'};
+$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'structure'}{'menu_up'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'structure'}{'menu_prev'}{'structure'}{'menu_up'};
 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'section'};
 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'structure'}{'directions'}{'NodePrev'}
 = $result_elements{'nodes_after_top_before_section_sections'}[0];
 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'structure'}{'directions'}{'NodeUp'}
 = $result_elements{'nodes_after_top_before_section_sections'}[0];
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 8dd13fb590..1f3aa06a78 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -111,7 +111,8 @@ $result_trees{'nodes_before_after_top'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -152,7 +153,8 @@ $result_trees{'nodes_before_after_top'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -273,7 +275,8 @@ $result_trees{'nodes_before_after_top'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -314,7 +317,8 @@ $result_trees{'nodes_before_after_top'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -469,7 +473,8 @@ $result_sectioning{'nodes_before_after_top'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -484,7 +489,8 @@ $result_sectioning{'nodes_before_after_top'} = {
                   'extra' => {
                     'normalized' => 'chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -523,35 +529,40 @@ $result_nodes{'nodes_before_after_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chap',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chap',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'nodes_before_after_top'}{'node_next'}{'node_prev'} = 
$result_nodes{'nodes_before_after_top'};
-$result_nodes{'nodes_before_after_top'}{'node_next'}{'node_up'} = 
$result_nodes{'nodes_before_after_top'};
+$result_nodes{'nodes_before_after_top'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_before_after_top'};
+$result_nodes{'nodes_before_after_top'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_after_top'};
 
 $result_menus{'nodes_before_after_top'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'nodes_before_after_top'} = [
diff --git a/tp/t/results/sectioning/nodes_before_after_top_xref.pl 
b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
index 36bf98911c..9d45e125e5 100644
--- a/tp/t/results/sectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
@@ -111,7 +111,8 @@ $result_trees{'nodes_before_after_top_xref'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -152,7 +153,8 @@ $result_trees{'nodes_before_after_top_xref'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -273,7 +275,8 @@ $result_trees{'nodes_before_after_top_xref'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -314,7 +317,8 @@ $result_trees{'nodes_before_after_top_xref'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -756,7 +760,8 @@ $result_sectioning{'nodes_before_after_top_xref'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -771,7 +776,8 @@ $result_sectioning{'nodes_before_after_top_xref'} = {
                   'extra' => {
                     'normalized' => 'chap',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -810,35 +816,40 @@ $result_nodes{'nodes_before_after_top_xref'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chap',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chap',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'nodes_before_after_top_xref'}{'node_next'}{'node_prev'} = 
$result_nodes{'nodes_before_after_top_xref'};
-$result_nodes{'nodes_before_after_top_xref'}{'node_next'}{'node_up'} = 
$result_nodes{'nodes_before_after_top_xref'};
+$result_nodes{'nodes_before_after_top_xref'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_before_after_top_xref'};
+$result_nodes{'nodes_before_after_top_xref'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_after_top_xref'};
 
 $result_menus{'nodes_before_after_top_xref'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'nodes_before_after_top_xref'} = [];
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index 97f18b7505..b2e61d42e8 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -261,7 +261,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -337,7 +338,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -400,7 +402,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -596,7 +599,8 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -771,7 +775,8 @@ $result_sectioning{'nodes_before_top'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -786,7 +791,8 @@ $result_sectioning{'nodes_before_top'} = {
                   'extra' => {
                     'normalized' => 'second-node',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -825,24 +831,6 @@ $result_nodes{'nodes_before_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -858,50 +846,76 @@ $result_nodes{'nodes_before_top'} = {
       }
     }
   ],
-  'node_prev' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node-in-menu-before-top',
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'node_up' => {}
+      'structure' => {
+        'node_up' => {}
+      }
     },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
+    'node_prev' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
           }
         }
-      }
-    ],
-    'node_next' => {},
-    'node_up' => {
-      'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'dir'
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node-in-menu-before-top',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_up' => {}
+          }
+        },
+        'node_next' => {},
+        'node_up' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'dir'
+              }
+            ]
           }
-        ]
+        }
       }
     }
   }
 };
-$result_nodes{'nodes_before_top'}{'menu_child'}{'node_up'} = 
$result_nodes{'nodes_before_top'};
-$result_nodes{'nodes_before_top'}{'node_prev'}{'menu_child'}{'node_up'} = 
$result_nodes{'nodes_before_top'}{'node_prev'};
-$result_nodes{'nodes_before_top'}{'node_prev'}{'node_next'} = 
$result_nodes{'nodes_before_top'};
+$result_nodes{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top'};
+$result_nodes{'nodes_before_top'}{'structure'}{'node_prev'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_before_top'}{'structure'}{'node_prev'};
+$result_nodes{'nodes_before_top'}{'structure'}{'node_prev'}{'structure'}{'node_next'}
 = $result_nodes{'nodes_before_top'};
 
 $result_menus{'nodes_before_top'} = {
   'cmdname' => 'node',
@@ -909,19 +923,23 @@ $result_menus{'nodes_before_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'nodes_before_top'}{'menu_child'}{'menu_up'} = 
$result_menus{'nodes_before_top'};
+$result_menus{'nodes_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_before_top'};
 
 $result_errors{'nodes_before_top'} = [];
 
diff --git a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl 
b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index 68cd1b3fcc..37b1c1027b 100644
--- a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
+++ b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
@@ -221,7 +221,8 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -322,7 +323,8 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -414,15 +416,6 @@ $result_nodes{'nodes_no_node_top_explicit_directions'} = {
     'normalized' => 'first',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -438,18 +431,32 @@ $result_nodes{'nodes_no_node_top_explicit_directions'} = {
       }
     }
   ],
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      },
+      'structure' => {}
     }
   }
 };
-$result_nodes{'nodes_no_node_top_explicit_directions'}{'menu_child'}{'node_prev'}
 = $result_nodes{'nodes_no_node_top_explicit_directions'};
-$result_nodes{'nodes_no_node_top_explicit_directions'}{'menu_child'}{'node_up'}
 = $result_nodes{'nodes_no_node_top_explicit_directions'};
+$result_nodes{'nodes_no_node_top_explicit_directions'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'nodes_no_node_top_explicit_directions'};
+$result_nodes{'nodes_no_node_top_explicit_directions'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'nodes_no_node_top_explicit_directions'};
 
 $result_menus{'nodes_no_node_top_explicit_directions'} = {
   'cmdname' => 'node',
@@ -457,19 +464,23 @@ $result_menus{'nodes_no_node_top_explicit_directions'} = {
     'normalized' => 'first',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'first' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'first' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'nodes_no_node_top_explicit_directions'}{'menu_child'}{'menu_up'}
 = $result_menus{'nodes_no_node_top_explicit_directions'};
+$result_menus{'nodes_no_node_top_explicit_directions'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'nodes_no_node_top_explicit_directions'};
 
 $result_errors{'nodes_no_node_top_explicit_directions'} = [];
 
@@ -486,15 +497,19 @@ $result_elements{'nodes_no_node_top_explicit_directions'} 
= [
           'normalized' => 'first',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'second-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'first' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'second-node',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'first' => 1
+              }
+            }
           }
         }
       },
@@ -536,10 +551,10 @@ $result_elements{'nodes_no_node_top_explicit_directions'} 
= [
   },
   {}
 ];
-$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'};
+$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'};
 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'};
-$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'nodes_no_node_top_explicit_directions'}[0];
 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = $result_elements{'nodes_no_node_top_explicit_directions'}[0];
 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodePrev'}
 = $result_elements{'nodes_no_node_top_explicit_directions'}[0];
diff --git a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl 
b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
index ca14e4ffe4..fbe02b7294 100644
--- a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
@@ -229,7 +229,8 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -542,7 +543,8 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -670,7 +672,8 @@ $result_sectioning{'non_automatic_internal_top_node_up'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -699,14 +702,6 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -722,10 +717,22 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'non_automatic_internal_top_node_up'}{'menu_child'}{'node_prev'} 
= $result_nodes{'non_automatic_internal_top_node_up'};
-$result_nodes{'non_automatic_internal_top_node_up'}{'node_next'} = 
$result_nodes{'non_automatic_internal_top_node_up'}{'menu_child'};
+$result_nodes{'non_automatic_internal_top_node_up'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'non_automatic_internal_top_node_up'};
+$result_nodes{'non_automatic_internal_top_node_up'}{'structure'}{'node_next'} 
= 
$result_nodes{'non_automatic_internal_top_node_up'}{'structure'}{'menu_child'};
 
 $result_menus{'non_automatic_internal_top_node_up'} = {
   'cmdname' => 'node',
@@ -733,19 +740,23 @@ $result_menus{'non_automatic_internal_top_node_up'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'non_automatic_internal_top_node_up'}{'menu_child'}{'menu_up'} = 
$result_menus{'non_automatic_internal_top_node_up'};
+$result_menus{'non_automatic_internal_top_node_up'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'non_automatic_internal_top_node_up'};
 
 $result_errors{'non_automatic_internal_top_node_up'} = [
   {
@@ -790,15 +801,19 @@ $result_elements{'non_automatic_internal_top_node_up'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'first',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'first',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -840,10 +855,10 @@ $result_elements{'non_automatic_internal_top_node_up'} = [
   },
   {}
 ];
-$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'};
+$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'};
 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'unit_command'}
 = $result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'};
-$result_elements{'non_automatic_internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'non_automatic_internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'non_automatic_internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'non_automatic_internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'non_automatic_internal_top_node_up'}[0];
 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'non_automatic_internal_top_node_up'}[0];
 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = $result_elements{'non_automatic_internal_top_node_up'}[0];
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
index bdcc03fe70..260bc5cffd 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
@@ -229,7 +229,8 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -542,7 +543,8 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -670,7 +672,8 @@ $result_sectioning{'non_automatic_top_node_up_and_url'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -699,14 +702,6 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -722,10 +717,22 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'non_automatic_top_node_up_and_url'}{'menu_child'}{'node_prev'} 
= $result_nodes{'non_automatic_top_node_up_and_url'};
-$result_nodes{'non_automatic_top_node_up_and_url'}{'node_next'} = 
$result_nodes{'non_automatic_top_node_up_and_url'}{'menu_child'};
+$result_nodes{'non_automatic_top_node_up_and_url'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'non_automatic_top_node_up_and_url'};
+$result_nodes{'non_automatic_top_node_up_and_url'}{'structure'}{'node_next'} = 
$result_nodes{'non_automatic_top_node_up_and_url'}{'structure'}{'menu_child'};
 
 $result_menus{'non_automatic_top_node_up_and_url'} = {
   'cmdname' => 'node',
@@ -733,19 +740,23 @@ $result_menus{'non_automatic_top_node_up_and_url'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'non_automatic_top_node_up_and_url'}{'menu_child'}{'menu_up'} = 
$result_menus{'non_automatic_top_node_up_and_url'};
+$result_menus{'non_automatic_top_node_up_and_url'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'non_automatic_top_node_up_and_url'};
 
 $result_errors{'non_automatic_top_node_up_and_url'} = [
   {
@@ -790,15 +801,19 @@ $result_elements{'non_automatic_top_node_up_and_url'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'first',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'first',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -840,10 +855,10 @@ $result_elements{'non_automatic_top_node_up_and_url'} = [
   },
   {}
 ];
-$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'};
+$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'};
 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'unit_command'}
 = $result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'};
-$result_elements{'non_automatic_top_node_up_and_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'non_automatic_top_node_up_and_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'non_automatic_top_node_up_and_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'non_automatic_top_node_up_and_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'non_automatic_top_node_up_and_url'}[0];
 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'non_automatic_top_node_up_and_url'}[0];
 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = $result_elements{'non_automatic_top_node_up_and_url'}[0];
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
index 6ce3d0259b..53c18b06b4 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
@@ -121,7 +121,8 @@ $result_trees{'non_automatic_top_node_up_url'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -380,7 +381,8 @@ $result_trees{'non_automatic_top_node_up_url'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -485,7 +487,8 @@ $result_sectioning{'non_automatic_top_node_up_url'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -514,23 +517,6 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {
-      'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'dir'
-          }
-        ]
-      }
-    }
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -546,28 +532,50 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
       }
     }
   ],
-  'node_next' => {},
-  'node_prev' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
-    }
-  },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'dir'
+              }
+            ]
+          },
+          'structure' => {}
         }
-      ]
+      }
+    },
+    'node_next' => {},
+    'node_prev' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
+    },
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
     }
   }
 };
-$result_nodes{'non_automatic_top_node_up_url'}{'menu_child'}{'node_prev'} = 
$result_nodes{'non_automatic_top_node_up_url'};
-$result_nodes{'non_automatic_top_node_up_url'}{'node_next'} = 
$result_nodes{'non_automatic_top_node_up_url'}{'menu_child'};
+$result_nodes{'non_automatic_top_node_up_url'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'non_automatic_top_node_up_url'};
+$result_nodes{'non_automatic_top_node_up_url'}{'structure'}{'node_next'} = 
$result_nodes{'non_automatic_top_node_up_url'}{'structure'}{'menu_child'};
 
 $result_menus{'non_automatic_top_node_up_url'} = {
   'cmdname' => 'node',
@@ -575,19 +583,23 @@ $result_menus{'non_automatic_top_node_up_url'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'non_automatic_top_node_up_url'}{'menu_child'}{'menu_up'} = 
$result_menus{'non_automatic_top_node_up_url'};
+$result_menus{'non_automatic_top_node_up_url'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'non_automatic_top_node_up_url'};
 
 $result_errors{'non_automatic_top_node_up_url'} = [];
 
@@ -604,15 +616,19 @@ $result_elements{'non_automatic_top_node_up_url'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'first',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'first',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -684,10 +700,10 @@ $result_elements{'non_automatic_top_node_up_url'} = [
   },
   {}
 ];
-$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'};
+$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'};
 $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'unit_command'} 
= $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'};
-$result_elements{'non_automatic_top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'non_automatic_top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'non_automatic_top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'non_automatic_top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'non_automatic_top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'non_automatic_top_node_up_url'}[0];
 
$result_elements{'non_automatic_top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'non_automatic_top_node_up_url'}[0];
 
$result_elements{'non_automatic_top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = $result_elements{'non_automatic_top_node_up_url'}[0];
diff --git a/tp/t/results/sectioning/novalidate.pl 
b/tp/t/results/sectioning/novalidate.pl
index c390137d50..6ecda01bd2 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -262,7 +262,8 @@ $result_trees{'novalidate'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -348,9 +349,11 @@ $result_nodes{'novalidate'} = {
       }
     }
   ],
-  'node_next' => {
-    'extra' => {
-      'normalized' => 'unknown-node'
+  'structure' => {
+    'node_next' => {
+      'extra' => {
+        'normalized' => 'unknown-node'
+      }
     }
   }
 };
@@ -360,7 +363,8 @@ $result_menus{'novalidate'} = {
   'extra' => {
     'normalized' => 'first',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'novalidate'} = [];
diff --git a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl 
b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
index 6e757d2c86..892bc95eef 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -199,7 +199,8 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -259,13 +260,16 @@ $result_nodes{'one_node_explicit_directions_anchor'} = {
     'normalized' => 'one-node',
     'spaces_before_argument' => ' '
   },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
+  'structure' => {
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      },
+      'structure' => {}
     }
   }
 };
@@ -275,7 +279,8 @@ $result_menus{'one_node_explicit_directions_anchor'} = {
   'extra' => {
     'normalized' => 'one-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'one_node_explicit_directions_anchor'} = [];
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index ac9805dc2b..e0b2018863 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -51,7 +51,8 @@ $result_trees{'one_subsection_and_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -120,7 +121,8 @@ $result_sectioning{'one_subsection_and_node'} = {
             'extra' => {
               'normalized' => 'one-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -150,7 +152,8 @@ $result_nodes{'one_subsection_and_node'} = {
     },
     'normalized' => 'one-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'one_subsection_and_node'} = {
@@ -158,7 +161,8 @@ $result_menus{'one_subsection_and_node'} = {
   'extra' => {
     'normalized' => 'one-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'one_subsection_and_node'} = [];
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 6f9bdcf495..98790a530d 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -52,7 +52,8 @@ $result_trees{'part_chapter_after_top'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -298,7 +299,8 @@ $result_trees{'part_chapter_after_top'} = [
           'line_nr' => 10,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -433,7 +435,8 @@ $result_sectioning{'part_chapter_after_top'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -453,7 +456,8 @@ $result_sectioning{'part_chapter_after_top'} = {
                 'extra' => {
                   'normalized' => 'chapter',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -504,34 +508,6 @@ $result_nodes{'part_chapter_after_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'associated_part' => {
-            'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 0
-            }
-          },
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -547,11 +523,43 @@ $result_nodes{'part_chapter_after_top'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'associated_part' => {
+              'cmdname' => 'part',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 0
+              }
+            },
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'part_chapter_after_top'}{'menu_child'}{'node_prev'} = 
$result_nodes{'part_chapter_after_top'};
-$result_nodes{'part_chapter_after_top'}{'menu_child'}{'node_up'} = 
$result_nodes{'part_chapter_after_top'};
-$result_nodes{'part_chapter_after_top'}{'node_next'} = 
$result_nodes{'part_chapter_after_top'}{'menu_child'};
+$result_nodes{'part_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'part_chapter_after_top'};
+$result_nodes{'part_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'part_chapter_after_top'};
+$result_nodes{'part_chapter_after_top'}{'structure'}{'node_next'} = 
$result_nodes{'part_chapter_after_top'}{'structure'}{'menu_child'};
 
 $result_menus{'part_chapter_after_top'} = {
   'cmdname' => 'node',
@@ -559,19 +567,23 @@ $result_menus{'part_chapter_after_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'part_chapter_after_top'}{'menu_child'}{'menu_up'} = 
$result_menus{'part_chapter_after_top'};
+$result_menus{'part_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'part_chapter_after_top'};
 
 $result_errors{'part_chapter_after_top'} = [];
 
@@ -588,15 +600,19 @@ $result_elements{'part_chapter_after_top'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'chapter',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'chapter',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -660,9 +676,9 @@ $result_elements{'part_chapter_after_top'} = [
   },
   {}
 ];
-$result_elements{'part_chapter_after_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_chapter_after_top'}[0]{'extra'}{'node'};
+$result_elements{'part_chapter_after_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'part_chapter_after_top'}[0]{'extra'}{'node'};
 $result_elements{'part_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'section'};
-$result_elements{'part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = $result_elements{'part_chapter_after_top'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'part_chapter_after_top'}[0];
 
$result_elements{'part_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'part_chapter_after_top'}[0];
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index eb91818b07..ca66266599 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -52,7 +52,8 @@ $result_trees{'part_node_after_top'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -248,7 +249,8 @@ $result_trees{'part_node_after_top'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -380,7 +382,8 @@ $result_sectioning{'part_node_after_top'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -422,15 +425,6 @@ $result_nodes{'part_node_after_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'part-node-after-top',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -446,11 +440,24 @@ $result_nodes{'part_node_after_top'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'part-node-after-top',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'part_node_after_top'}{'menu_child'}{'node_prev'} = 
$result_nodes{'part_node_after_top'};
-$result_nodes{'part_node_after_top'}{'menu_child'}{'node_up'} = 
$result_nodes{'part_node_after_top'};
-$result_nodes{'part_node_after_top'}{'node_next'} = 
$result_nodes{'part_node_after_top'}{'menu_child'};
+$result_nodes{'part_node_after_top'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_after_top'};
+$result_nodes{'part_node_after_top'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_after_top'};
+$result_nodes{'part_node_after_top'}{'structure'}{'node_next'} = 
$result_nodes{'part_node_after_top'}{'structure'}{'menu_child'};
 
 $result_menus{'part_node_after_top'} = {
   'cmdname' => 'node',
@@ -458,19 +465,23 @@ $result_menus{'part_node_after_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'part-node-after-top',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'part-node-after-top',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'part_node_after_top'}{'menu_child'}{'menu_up'} = 
$result_menus{'part_node_after_top'};
+$result_menus{'part_node_after_top'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_after_top'};
 
 $result_errors{'part_node_after_top'} = [
   {
@@ -506,15 +517,19 @@ $result_elements{'part_node_after_top'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'part-node-after-top',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'part-node-after-top',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -566,7 +581,7 @@ $result_elements{'part_node_after_top'} = [
   },
   {}
 ];
-$result_elements{'part_node_after_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_node_after_top'}[0]{'extra'}{'node'};
+$result_elements{'part_node_after_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_after_top'}[0]{'extra'}{'node'};
 $result_elements{'part_node_after_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_after_top'}[0]{'extra'}{'section'};
 
$result_elements{'part_node_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'part_node_after_top'}[0];
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index 11edc86db7..b31ee57f92 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -93,7 +93,8 @@ $result_trees{'part_node_before_top'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -173,7 +174,8 @@ $result_trees{'part_node_before_top'} = [
           'line_nr' => 4,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -419,7 +421,8 @@ $result_sectioning{'part_node_before_top'} = {
                 'extra' => {
                   'normalized' => 'Top',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -471,16 +474,6 @@ $result_nodes{'part_node_before_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'part-node-before-top',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -496,12 +489,26 @@ $result_nodes{'part_node_before_top'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'part-node-before-top',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'part_node_before_top'}{'menu_child'}{'node_next'} = 
$result_nodes{'part_node_before_top'};
-$result_nodes{'part_node_before_top'}{'menu_child'}{'node_prev'} = 
$result_nodes{'part_node_before_top'};
-$result_nodes{'part_node_before_top'}{'menu_child'}{'node_up'} = 
$result_nodes{'part_node_before_top'};
-$result_nodes{'part_node_before_top'}{'node_next'} = 
$result_nodes{'part_node_before_top'}{'menu_child'};
+$result_nodes{'part_node_before_top'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = $result_nodes{'part_node_before_top'};
+$result_nodes{'part_node_before_top'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_before_top'};
+$result_nodes{'part_node_before_top'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_before_top'};
+$result_nodes{'part_node_before_top'}{'structure'}{'node_next'} = 
$result_nodes{'part_node_before_top'}{'structure'}{'menu_child'};
 
 $result_menus{'part_node_before_top'} = {
   'cmdname' => 'node',
@@ -509,19 +516,23 @@ $result_menus{'part_node_before_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'part-node-before-top',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'part-node-before-top',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'part_node_before_top'}{'menu_child'}{'menu_up'} = 
$result_menus{'part_node_before_top'};
+$result_menus{'part_node_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_before_top'};
 
 $result_errors{'part_node_before_top'} = [
   {
@@ -557,15 +568,19 @@ $result_elements{'part_node_before_top'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'part-node-before-top',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'part-node-before-top',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -600,7 +615,7 @@ $result_elements{'part_node_before_top'} = [
     'type' => 'unit'
   }
 ];
-$result_elements{'part_node_before_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_node_before_top'}[0]{'extra'}{'node'};
+$result_elements{'part_node_before_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_before_top'}[0]{'extra'}{'node'};
 $result_elements{'part_node_before_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_before_top'}[0]{'extra'}{'section'};
 
$result_elements{'part_node_before_top'}[0]{'structure'}{'directions'}{'NodeBack'}
 = $result_elements{'part_node_before_top'}[0];
 
$result_elements{'part_node_before_top'}[0]{'structure'}{'directions'}{'NodeForward'}
 = $result_elements{'part_node_before_top'}[0];
diff --git a/tp/t/results/sectioning/part_node_chapter_after_top.pl 
b/tp/t/results/sectioning/part_node_chapter_after_top.pl
index c144605c70..639ef60620 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -52,7 +52,8 @@ $result_trees{'part_node_chapter_after_top'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -428,7 +429,8 @@ $result_trees{'part_node_chapter_after_top'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -511,7 +513,8 @@ $result_trees{'part_node_chapter_after_top'} = [
           'line_nr' => 14,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -687,7 +690,8 @@ $result_sectioning{'part_node_chapter_after_top'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -707,7 +711,8 @@ $result_sectioning{'part_node_chapter_after_top'} = {
                 'extra' => {
                   'normalized' => 'chapter',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -758,43 +763,6 @@ $result_nodes{'part_node_chapter_after_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'a-node-after-part',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
-          'extra' => {
-            'associated_part' => {
-              'cmdname' => 'part',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
-              'structure' => {
-                'level' => 0
-              }
-            },
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 1,
-            'number' => 1
-          }
-        },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -810,13 +778,56 @@ $result_nodes{'part_node_chapter_after_top'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'a-node-after-part',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_part' => {
+                  'cmdname' => 'part',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 0
+                  }
+                },
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 1
+              }
+            },
+            'normalized' => 'chapter',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'part_node_chapter_after_top'}{'menu_child'}{'node_next'}{'node_next'}
 = $result_nodes{'part_node_chapter_after_top'}{'menu_child'};
-$result_nodes{'part_node_chapter_after_top'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'part_node_chapter_after_top'};
-$result_nodes{'part_node_chapter_after_top'}{'menu_child'}{'node_prev'} = 
$result_nodes{'part_node_chapter_after_top'};
-$result_nodes{'part_node_chapter_after_top'}{'menu_child'}{'node_up'} = 
$result_nodes{'part_node_chapter_after_top'};
-$result_nodes{'part_node_chapter_after_top'}{'node_next'} = 
$result_nodes{'part_node_chapter_after_top'}{'menu_child'};
+$result_nodes{'part_node_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}
 = $result_nodes{'part_node_chapter_after_top'}{'structure'}{'menu_child'};
+$result_nodes{'part_node_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_chapter_after_top'};
+$result_nodes{'part_node_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_chapter_after_top'};
+$result_nodes{'part_node_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_chapter_after_top'};
+$result_nodes{'part_node_chapter_after_top'}{'structure'}{'node_next'} = 
$result_nodes{'part_node_chapter_after_top'}{'structure'}{'menu_child'};
 
 $result_menus{'part_node_chapter_after_top'} = {
   'cmdname' => 'node',
@@ -824,33 +835,39 @@ $result_menus{'part_node_chapter_after_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'a-node-after-part',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
+        'normalized' => 'a-node-after-part',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'chapter',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'part_node_chapter_after_top'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'part_node_chapter_after_top'}{'menu_child'};
-$result_menus{'part_node_chapter_after_top'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'part_node_chapter_after_top'};
-$result_menus{'part_node_chapter_after_top'}{'menu_child'}{'menu_up'} = 
$result_menus{'part_node_chapter_after_top'};
+$result_menus{'part_node_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'part_node_chapter_after_top'}{'structure'}{'menu_child'};
+$result_menus{'part_node_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_chapter_after_top'};
+$result_menus{'part_node_chapter_after_top'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_chapter_after_top'};
 
 $result_errors{'part_node_chapter_after_top'} = [];
 
@@ -867,27 +884,33 @@ $result_elements{'part_node_chapter_after_top'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'a-node-after-part',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter',
+              'normalized' => 'a-node-after-part',
               'spaces_before_argument' => ' '
             },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'chapter',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
+              },
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -952,11 +975,11 @@ $result_elements{'part_node_chapter_after_top'} = [
   },
   {}
 ];
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'};
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'};
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'};
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'};
 $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'section'};
-$result_elements{'part_node_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
+$result_elements{'part_node_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'part_node_chapter_after_top'}[0];
 
$result_elements{'part_node_chapter_after_top'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'part_node_chapter_after_top'}[0];
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 0197bbd56f..38e0c96819 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -52,7 +52,8 @@ $result_trees{'part_node_chapter_appendix'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -298,7 +299,8 @@ $result_trees{'part_node_chapter_appendix'} = [
           'line_nr' => 10,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -497,7 +499,8 @@ $result_sectioning{'part_node_chapter_appendix'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -517,7 +520,8 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                 'extra' => {
                   'normalized' => 'chapter-node',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -586,34 +590,6 @@ $result_nodes{'part_node_chapter_appendix'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'associated_part' => {
-            'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 0
-            }
-          },
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -629,11 +605,43 @@ $result_nodes{'part_node_chapter_appendix'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'associated_part' => {
+              'cmdname' => 'part',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 0
+              }
+            },
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'part_node_chapter_appendix'}{'menu_child'}{'node_prev'} = 
$result_nodes{'part_node_chapter_appendix'};
-$result_nodes{'part_node_chapter_appendix'}{'menu_child'}{'node_up'} = 
$result_nodes{'part_node_chapter_appendix'};
-$result_nodes{'part_node_chapter_appendix'}{'node_next'} = 
$result_nodes{'part_node_chapter_appendix'}{'menu_child'};
+$result_nodes{'part_node_chapter_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_chapter_appendix'};
+$result_nodes{'part_node_chapter_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_chapter_appendix'};
+$result_nodes{'part_node_chapter_appendix'}{'structure'}{'node_next'} = 
$result_nodes{'part_node_chapter_appendix'}{'structure'}{'menu_child'};
 
 $result_menus{'part_node_chapter_appendix'} = {
   'cmdname' => 'node',
@@ -641,19 +649,23 @@ $result_menus{'part_node_chapter_appendix'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'part_node_chapter_appendix'}{'menu_child'}{'menu_up'} = 
$result_menus{'part_node_chapter_appendix'};
+$result_menus{'part_node_chapter_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_chapter_appendix'};
 
 $result_errors{'part_node_chapter_appendix'} = [];
 
@@ -670,15 +682,19 @@ $result_elements{'part_node_chapter_appendix'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'chapter-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'chapter-node',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -768,9 +784,9 @@ $result_elements{'part_node_chapter_appendix'} = [
   {},
   {}
 ];
-$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'node'};
+$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'node'};
 $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'section'};
-$result_elements{'part_node_chapter_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'part_node_chapter_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'part_node_chapter_appendix'}[0];
 
$result_elements{'part_node_chapter_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'part_node_chapter_appendix'}[0];
diff --git a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
index c044a10c43..876bbbc93f 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -52,7 +52,8 @@ $result_trees{'part_node_chapter_node_appendix'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -355,7 +356,8 @@ $result_trees{'part_node_chapter_node_appendix'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -450,7 +452,8 @@ $result_trees{'part_node_chapter_node_appendix'} = [
           'line_nr' => 14,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -615,7 +618,8 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -635,7 +639,8 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                 'extra' => {
                   'normalized' => 'chapter-node',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -667,7 +672,8 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
             'extra' => {
               'normalized' => 'appendix-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -711,75 +717,81 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'associated_part' => {
-            'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 0
-            }
-          },
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'appendix',
+          'cmdname' => 'chapter',
           'extra' => {
+            'associated_part' => {
+              'cmdname' => 'part',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 0
+              }
+            },
             'spaces_before_argument' => ' '
           },
           'structure' => {
             'level' => 1,
-            'number' => 'A'
+            'number' => 1
           }
         },
-        'normalized' => 'appendix-node',
+        'normalized' => 'chapter-node',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'appendix',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 'A'
+              }
+            },
+            'normalized' => 'appendix-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'part_node_chapter_node_appendix'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'part_node_chapter_node_appendix'}{'menu_child'};
-$result_nodes{'part_node_chapter_node_appendix'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'part_node_chapter_node_appendix'};
-$result_nodes{'part_node_chapter_node_appendix'}{'menu_child'}{'node_prev'} = 
$result_nodes{'part_node_chapter_node_appendix'};
-$result_nodes{'part_node_chapter_node_appendix'}{'menu_child'}{'node_up'} = 
$result_nodes{'part_node_chapter_node_appendix'};
-$result_nodes{'part_node_chapter_node_appendix'}{'node_next'} = 
$result_nodes{'part_node_chapter_node_appendix'}{'menu_child'};
+$result_nodes{'part_node_chapter_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_chapter_node_appendix'}{'structure'}{'menu_child'};
+$result_nodes{'part_node_chapter_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_chapter_node_appendix'};
+$result_nodes{'part_node_chapter_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_chapter_node_appendix'};
+$result_nodes{'part_node_chapter_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_chapter_node_appendix'};
+$result_nodes{'part_node_chapter_node_appendix'}{'structure'}{'node_next'} = 
$result_nodes{'part_node_chapter_node_appendix'}{'structure'}{'menu_child'};
 
 $result_menus{'part_node_chapter_node_appendix'} = {
   'cmdname' => 'node',
@@ -787,33 +799,39 @@ $result_menus{'part_node_chapter_node_appendix'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'appendix-node',
+        'normalized' => 'chapter-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'appendix-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'part_node_chapter_node_appendix'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'part_node_chapter_node_appendix'}{'menu_child'};
-$result_menus{'part_node_chapter_node_appendix'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'part_node_chapter_node_appendix'};
-$result_menus{'part_node_chapter_node_appendix'}{'menu_child'}{'menu_up'} = 
$result_menus{'part_node_chapter_node_appendix'};
+$result_menus{'part_node_chapter_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'part_node_chapter_node_appendix'}{'structure'}{'menu_child'};
+$result_menus{'part_node_chapter_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_chapter_node_appendix'};
+$result_menus{'part_node_chapter_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_chapter_node_appendix'};
 
 $result_errors{'part_node_chapter_node_appendix'} = [];
 
@@ -830,27 +848,33 @@ $result_elements{'part_node_chapter_node_appendix'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'chapter-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'appendix-node',
+              'normalized' => 'chapter-node',
               'spaces_before_argument' => ' '
             },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'appendix-node',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
+              },
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -946,15 +970,15 @@ $result_elements{'part_node_chapter_node_appendix'} = [
   {},
   {}
 ];
-$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'};
-$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'};
+$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'};
+$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'unit_command'} 
= $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'section'};
-$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'part_node_chapter_node_appendix'}[0];
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'part_node_chapter_node_appendix'}[0];
-$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
+$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'};
diff --git a/tp/t/results/sectioning/part_node_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_node_part_appendix.pl
index 55f626d4f9..da809c1ab9 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -52,7 +52,8 @@ $result_trees{'part_node_node_part_appendix'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -355,7 +356,8 @@ $result_trees{'part_node_node_part_appendix'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -450,7 +452,8 @@ $result_trees{'part_node_node_part_appendix'} = [
           'line_nr' => 14,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -665,7 +668,8 @@ $result_sectioning{'part_node_node_part_appendix'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -685,7 +689,8 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                 'extra' => {
                   'normalized' => 'chapter-node',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -720,7 +725,8 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                 'extra' => {
                   'normalized' => 'appendix-part',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -778,36 +784,27 @@ $result_nodes{'part_node_node_part_appendix'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'associated_part' => {
-            'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 0
-            }
-          },
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'appendix',
+          'cmdname' => 'chapter',
           'extra' => {
             'associated_part' => {
               'cmdname' => 'part',
@@ -822,40 +819,55 @@ $result_nodes{'part_node_node_part_appendix'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 'A'
+            'number' => 1
           }
         },
-        'normalized' => 'appendix-part',
+        'normalized' => 'chapter-node',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'appendix',
+              'extra' => {
+                'associated_part' => {
+                  'cmdname' => 'part',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 0
+                  }
+                },
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 'A'
+              }
+            },
+            'normalized' => 'appendix-part',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'part_node_node_part_appendix'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'part_node_node_part_appendix'}{'menu_child'};
-$result_nodes{'part_node_node_part_appendix'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'part_node_node_part_appendix'};
-$result_nodes{'part_node_node_part_appendix'}{'menu_child'}{'node_prev'} = 
$result_nodes{'part_node_node_part_appendix'};
-$result_nodes{'part_node_node_part_appendix'}{'menu_child'}{'node_up'} = 
$result_nodes{'part_node_node_part_appendix'};
-$result_nodes{'part_node_node_part_appendix'}{'node_next'} = 
$result_nodes{'part_node_node_part_appendix'}{'menu_child'};
+$result_nodes{'part_node_node_part_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_node_part_appendix'}{'structure'}{'menu_child'};
+$result_nodes{'part_node_node_part_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_node_part_appendix'};
+$result_nodes{'part_node_node_part_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_node_part_appendix'};
+$result_nodes{'part_node_node_part_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_node_part_appendix'};
+$result_nodes{'part_node_node_part_appendix'}{'structure'}{'node_next'} = 
$result_nodes{'part_node_node_part_appendix'}{'structure'}{'menu_child'};
 
 $result_menus{'part_node_node_part_appendix'} = {
   'cmdname' => 'node',
@@ -863,33 +875,39 @@ $result_menus{'part_node_node_part_appendix'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'appendix-part',
+        'normalized' => 'chapter-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'appendix-part',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'part_node_node_part_appendix'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'part_node_node_part_appendix'}{'menu_child'};
-$result_menus{'part_node_node_part_appendix'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'part_node_node_part_appendix'};
-$result_menus{'part_node_node_part_appendix'}{'menu_child'}{'menu_up'} = 
$result_menus{'part_node_node_part_appendix'};
+$result_menus{'part_node_node_part_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'part_node_node_part_appendix'}{'structure'}{'menu_child'};
+$result_menus{'part_node_node_part_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_node_part_appendix'};
+$result_menus{'part_node_node_part_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_node_part_appendix'};
 
 $result_errors{'part_node_node_part_appendix'} = [
   {
@@ -916,27 +934,33 @@ $result_elements{'part_node_node_part_appendix'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'chapter-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'appendix-part',
+              'normalized' => 'chapter-node',
               'spaces_before_argument' => ' '
             },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'appendix-part',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
+              },
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -1040,15 +1064,15 @@ $result_elements{'part_node_node_part_appendix'} = [
   {},
   {}
 ];
-$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'};
-$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'};
+$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'};
+$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'};
 $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'section'};
-$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'part_node_node_part_appendix'}[0];
 
$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'part_node_node_part_appendix'}[0];
-$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
+$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'};
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index a22e475bf3..da23d03e91 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -52,7 +52,8 @@ $result_trees{'part_node_part_appendix'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -298,7 +299,8 @@ $result_trees{'part_node_part_appendix'} = [
           'line_nr' => 10,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -547,7 +549,8 @@ $result_sectioning{'part_node_part_appendix'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -567,7 +570,8 @@ $result_sectioning{'part_node_part_appendix'} = {
                 'extra' => {
                   'normalized' => 'chapter-node',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -653,34 +657,6 @@ $result_nodes{'part_node_part_appendix'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'associated_part' => {
-            'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 0
-            }
-          },
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -696,11 +672,43 @@ $result_nodes{'part_node_part_appendix'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'associated_part' => {
+              'cmdname' => 'part',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 0
+              }
+            },
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'part_node_part_appendix'}{'menu_child'}{'node_prev'} = 
$result_nodes{'part_node_part_appendix'};
-$result_nodes{'part_node_part_appendix'}{'menu_child'}{'node_up'} = 
$result_nodes{'part_node_part_appendix'};
-$result_nodes{'part_node_part_appendix'}{'node_next'} = 
$result_nodes{'part_node_part_appendix'}{'menu_child'};
+$result_nodes{'part_node_part_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_part_appendix'};
+$result_nodes{'part_node_part_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_part_appendix'};
+$result_nodes{'part_node_part_appendix'}{'structure'}{'node_next'} = 
$result_nodes{'part_node_part_appendix'}{'structure'}{'menu_child'};
 
 $result_menus{'part_node_part_appendix'} = {
   'cmdname' => 'node',
@@ -708,19 +716,23 @@ $result_menus{'part_node_part_appendix'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'chapter-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'part_node_part_appendix'}{'menu_child'}{'menu_up'} = 
$result_menus{'part_node_part_appendix'};
+$result_menus{'part_node_part_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_part_appendix'};
 
 $result_errors{'part_node_part_appendix'} = [];
 
@@ -737,15 +749,19 @@ $result_elements{'part_node_part_appendix'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'chapter-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'chapter-node',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -843,9 +859,9 @@ $result_elements{'part_node_part_appendix'} = [
   {},
   {}
 ];
-$result_elements{'part_node_part_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_node_part_appendix'}[0]{'extra'}{'node'};
+$result_elements{'part_node_part_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_part_appendix'}[0]{'extra'}{'node'};
 $result_elements{'part_node_part_appendix'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'section'};
-$result_elements{'part_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'part_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'part_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'part_node_part_appendix'}[0];
 
$result_elements{'part_node_part_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'part_node_part_appendix'}[0];
diff --git a/tp/t/results/sectioning/part_node_part_node_appendix.pl 
b/tp/t/results/sectioning/part_node_part_node_appendix.pl
index 920090c0f4..e8ba7e519f 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -52,7 +52,8 @@ $result_trees{'part_node_part_node_appendix'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -355,7 +356,8 @@ $result_trees{'part_node_part_node_appendix'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -489,7 +491,8 @@ $result_trees{'part_node_part_node_appendix'} = [
           'line_nr' => 16,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -665,7 +668,8 @@ $result_sectioning{'part_node_part_node_appendix'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -685,7 +689,8 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                 'extra' => {
                   'normalized' => 'chapter-node',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -720,7 +725,8 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                 'extra' => {
                   'normalized' => 'appendix-node',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -778,36 +784,27 @@ $result_nodes{'part_node_part_node_appendix'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'associated_part' => {
-            'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 0
-            }
-          },
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
+      }
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'appendix',
+          'cmdname' => 'chapter',
           'extra' => {
             'associated_part' => {
               'cmdname' => 'part',
@@ -822,40 +819,55 @@ $result_nodes{'part_node_part_node_appendix'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 'A'
+            'number' => 1
           }
         },
-        'normalized' => 'appendix-node',
+        'normalized' => 'chapter-node',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'appendix',
+              'extra' => {
+                'associated_part' => {
+                  'cmdname' => 'part',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 0
+                  }
+                },
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 'A'
+              }
+            },
+            'normalized' => 'appendix-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'part_node_part_node_appendix'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'part_node_part_node_appendix'}{'menu_child'};
-$result_nodes{'part_node_part_node_appendix'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'part_node_part_node_appendix'};
-$result_nodes{'part_node_part_node_appendix'}{'menu_child'}{'node_prev'} = 
$result_nodes{'part_node_part_node_appendix'};
-$result_nodes{'part_node_part_node_appendix'}{'menu_child'}{'node_up'} = 
$result_nodes{'part_node_part_node_appendix'};
-$result_nodes{'part_node_part_node_appendix'}{'node_next'} = 
$result_nodes{'part_node_part_node_appendix'}{'menu_child'};
+$result_nodes{'part_node_part_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_part_node_appendix'}{'structure'}{'menu_child'};
+$result_nodes{'part_node_part_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_part_node_appendix'};
+$result_nodes{'part_node_part_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'part_node_part_node_appendix'};
+$result_nodes{'part_node_part_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'part_node_part_node_appendix'};
+$result_nodes{'part_node_part_node_appendix'}{'structure'}{'node_next'} = 
$result_nodes{'part_node_part_node_appendix'}{'structure'}{'menu_child'};
 
 $result_menus{'part_node_part_node_appendix'} = {
   'cmdname' => 'node',
@@ -863,33 +875,39 @@ $result_menus{'part_node_part_node_appendix'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'appendix-node',
+        'normalized' => 'chapter-node',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'appendix-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'part_node_part_node_appendix'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'part_node_part_node_appendix'}{'menu_child'};
-$result_menus{'part_node_part_node_appendix'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'part_node_part_node_appendix'};
-$result_menus{'part_node_part_node_appendix'}{'menu_child'}{'menu_up'} = 
$result_menus{'part_node_part_node_appendix'};
+$result_menus{'part_node_part_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'part_node_part_node_appendix'}{'structure'}{'menu_child'};
+$result_menus{'part_node_part_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_part_node_appendix'};
+$result_menus{'part_node_part_node_appendix'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'part_node_part_node_appendix'};
 
 $result_errors{'part_node_part_node_appendix'} = [];
 
@@ -906,27 +924,33 @@ $result_elements{'part_node_part_node_appendix'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'chapter-node',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'appendix-node',
+              'normalized' => 'chapter-node',
               'spaces_before_argument' => ' '
             },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'appendix-node',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
+              },
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -1030,15 +1054,15 @@ $result_elements{'part_node_part_node_appendix'} = [
   {},
   {}
 ];
-$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'};
-$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'};
+$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'};
+$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'};
 $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'section'};
-$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'part_node_part_node_appendix'}[0];
 
$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'part_node_part_node_appendix'}[0];
-$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
+$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'structure'}{'directions'}{'FastForward'};
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index 066cd203fc..ac6f2ffc31 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -646,7 +646,8 @@ $result_trees{'placed_things_before_node'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -990,7 +991,8 @@ $result_sectioning{'placed_things_before_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1018,7 +1020,8 @@ $result_nodes{'placed_things_before_node'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'placed_things_before_node'} = {
@@ -1026,7 +1029,8 @@ $result_menus{'placed_things_before_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'placed_things_before_node'} = [
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index acb69e179f..89dee59f07 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -58,7 +58,8 @@ $result_trees{'protected_node_parentheses'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -436,7 +437,8 @@ $result_trees{'protected_node_parentheses'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -546,7 +548,8 @@ $result_sectioning{'protected_node_parentheses'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -575,15 +578,6 @@ $result_nodes{'protected_node_parentheses'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_0028manual_0029-name',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -599,11 +593,24 @@ $result_nodes{'protected_node_parentheses'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => '_0028manual_0029-name',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'protected_node_parentheses'}{'menu_child'}{'node_prev'} = 
$result_nodes{'protected_node_parentheses'};
-$result_nodes{'protected_node_parentheses'}{'menu_child'}{'node_up'} = 
$result_nodes{'protected_node_parentheses'};
-$result_nodes{'protected_node_parentheses'}{'node_next'} = 
$result_nodes{'protected_node_parentheses'}{'menu_child'};
+$result_nodes{'protected_node_parentheses'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'protected_node_parentheses'};
+$result_nodes{'protected_node_parentheses'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'protected_node_parentheses'};
+$result_nodes{'protected_node_parentheses'}{'structure'}{'node_next'} = 
$result_nodes{'protected_node_parentheses'}{'structure'}{'menu_child'};
 
 $result_menus{'protected_node_parentheses'} = {
   'cmdname' => 'node',
@@ -611,19 +618,23 @@ $result_menus{'protected_node_parentheses'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_0028manual_0029-name',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => '_0028manual_0029-name',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'protected_node_parentheses'}{'menu_child'}{'menu_up'} = 
$result_menus{'protected_node_parentheses'};
+$result_menus{'protected_node_parentheses'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'protected_node_parentheses'};
 
 $result_errors{'protected_node_parentheses'} = [];
 
diff --git a/tp/t/results/sectioning/raiselowersections.pl 
b/tp/t/results/sectioning/raiselowersections.pl
index d4de4ef4fc..89d79696db 100644
--- a/tp/t/results/sectioning/raiselowersections.pl
+++ b/tp/t/results/sectioning/raiselowersections.pl
@@ -86,7 +86,8 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -326,7 +327,8 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -611,7 +613,8 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -809,7 +812,8 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1007,7 +1011,8 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 26,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1137,7 +1142,8 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1499,7 +1505,8 @@ $result_sectioning{'raiselowersections'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -1513,7 +1520,8 @@ $result_sectioning{'raiselowersections'} = {
                   'extra' => {
                     'normalized' => 'Chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1529,7 +1537,8 @@ $result_sectioning{'raiselowersections'} = {
                         'extra' => {
                           'normalized' => 'Chapter-in-included-file',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'sections_level' => -1,
                       'spaces_before_argument' => ' '
@@ -1546,7 +1555,8 @@ $result_sectioning{'raiselowersections'} = {
                               'extra' => {
                                 'normalized' => 'Section',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'sections_level' => -1,
                             'spaces_before_argument' => ' '
@@ -1563,7 +1573,8 @@ $result_sectioning{'raiselowersections'} = {
                                     'extra' => {
                                       'normalized' => 'Subsection',
                                       'spaces_before_argument' => ' '
-                                    }
+                                    },
+                                    'structure' => {}
                                   },
                                   'sections_level' => -1,
                                   'spaces_before_argument' => ' '
@@ -1596,7 +1607,8 @@ $result_sectioning{'raiselowersections'} = {
                   'extra' => {
                     'normalized' => 'Second-chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1641,171 +1653,183 @@ $result_nodes{'raiselowersections'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'Chapter',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
           'extra' => {
-            'sections_level' => -1,
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'Chapter-in-included-file',
+        'normalized' => 'Chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'sections_level' => -1,
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 3,
-              'number' => '1.1.1'
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
-          },
-          'normalized' => 'Section',
-          'spaces_before_argument' => ' '
-        },
+          }
+        }
+      ],
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'subsection',
+              'cmdname' => 'chapter',
               'extra' => {
                 'sections_level' => -1,
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 4,
-                'number' => '1.1.1.1'
+                'level' => 2,
+                'number' => '1.1'
               }
             },
-            'normalized' => 'Subsection',
+            'normalized' => 'Chapter-in-included-file',
             'spaces_before_argument' => ' '
           },
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
                 }
               }
             }
-          }
-        ],
-        'node_up' => {}
-      },
-      'menus' => [
-        {
-          'cmdname' => 'menu',
-          'extra' => {
-            'end_command' => {
-              'cmdname' => 'end',
+          ],
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
               'extra' => {
-                'command_argument' => 'menu',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'menu'
+                'associated_section' => {
+                  'cmdname' => 'section',
+                  'extra' => {
+                    'sections_level' => -1,
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 3,
+                    'number' => '1.1.1'
+                  }
+                },
+                'normalized' => 'Section',
+                'spaces_before_argument' => ' '
+              },
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
+                  'extra' => {
+                    'end_command' => {
+                      'cmdname' => 'end',
+                      'extra' => {
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
+                    }
+                  }
+                }
+              ],
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'associated_section' => {
+                      'cmdname' => 'subsection',
+                      'extra' => {
+                        'sections_level' => -1,
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'level' => 4,
+                        'number' => '1.1.1.1'
+                      }
+                    },
+                    'normalized' => 'Subsection',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'node_up' => {}
+                  }
+                },
+                'node_up' => {}
               }
-            }
-          }
-        }
-      ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
+            },
+            'node_up' => {}
           }
-        }
-      }
-    ],
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'associated_section' => {
-          'cmdname' => 'chapter',
+        },
+        'node_next' => {
+          'cmdname' => 'node',
           'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'Second-chapter',
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 1,
-            'number' => 2
+            'node_prev' => {},
+            'node_up' => {}
           }
         },
-        'normalized' => 'Second-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_nodes{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'raiselowersections'}{'menu_child'}{'menu_child'};
-$result_nodes{'raiselowersections'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'raiselowersections'}{'menu_child'};
-$result_nodes{'raiselowersections'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'raiselowersections'}{'menu_child'};
-$result_nodes{'raiselowersections'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'raiselowersections'};
-$result_nodes{'raiselowersections'}{'menu_child'}{'node_prev'} = 
$result_nodes{'raiselowersections'};
-$result_nodes{'raiselowersections'}{'menu_child'}{'node_up'} = 
$result_nodes{'raiselowersections'};
-$result_nodes{'raiselowersections'}{'node_next'} = 
$result_nodes{'raiselowersections'}{'menu_child'};
+$result_nodes{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'raiselowersections'}{'structure'}{'menu_child'};
+$result_nodes{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'raiselowersections'}{'structure'}{'menu_child'};
+$result_nodes{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'raiselowersections'};
+$result_nodes{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'raiselowersections'};
+$result_nodes{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'raiselowersections'};
+$result_nodes{'raiselowersections'}{'structure'}{'node_next'} = 
$result_nodes{'raiselowersections'}{'structure'}{'menu_child'};
 
 $result_menus{'raiselowersections'} = {
   'cmdname' => 'node',
@@ -1813,69 +1837,81 @@ $result_menus{'raiselowersections'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Chapter-in-included-file',
+        'normalized' => 'Chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'Section',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Subsection',
+            'normalized' => 'Chapter-in-included-file',
             'spaces_before_argument' => ' '
           },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Section' => 1
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'Section',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_child' => {
+                  'cmdname' => 'node',
+                  'extra' => {
+                    'normalized' => 'Subsection',
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Section' => 1
+                    }
+                  }
+                },
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Chapter-in-included-file' => 1
+                }
+              }
+            },
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Chapter' => 1
+            }
+          }
+        },
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Second-chapter',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           }
         },
         'menu_up' => {},
         'menu_up_hash' => {
-          'Chapter-in-included-file' => 1
+          'Top' => 1
         }
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Chapter' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'Second-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'};
-$result_menus{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'raiselowersections'}{'menu_child'}{'menu_child'};
-$result_menus{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'raiselowersections'}{'menu_child'};
-$result_menus{'raiselowersections'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'raiselowersections'}{'menu_child'};
-$result_menus{'raiselowersections'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'raiselowersections'};
-$result_menus{'raiselowersections'}{'menu_child'}{'menu_up'} = 
$result_menus{'raiselowersections'};
+$result_menus{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'raiselowersections'}{'structure'}{'menu_child'};
+$result_menus{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'raiselowersections'}{'structure'}{'menu_child'};
+$result_menus{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'raiselowersections'};
+$result_menus{'raiselowersections'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'raiselowersections'};
 
 $result_errors{'raiselowersections'} = [];
 
diff --git a/tp/t/results/sectioning/rec_nodes.pl 
b/tp/t/results/sectioning/rec_nodes.pl
index 50b48cb213..e095ab7ef2 100644
--- a/tp/t/results/sectioning/rec_nodes.pl
+++ b/tp/t/results/sectioning/rec_nodes.pl
@@ -242,7 +242,8 @@ $result_trees{'rec_nodes'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -501,7 +502,8 @@ $result_trees{'rec_nodes'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -693,7 +695,8 @@ $result_trees{'rec_nodes'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -896,7 +899,8 @@ $result_trees{'rec_nodes'} = {
         'line_nr' => 22,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1093,7 +1097,8 @@ $result_trees{'rec_nodes'} = {
         'line_nr' => 29,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -1331,19 +1336,28 @@ $result_nodes{'rec_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
+        }
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'other-node',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {},
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -1359,48 +1373,45 @@ $result_nodes{'rec_nodes'} = {
           }
         }
       ],
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'normalized' => 'other-node',
+            'spaces_before_argument' => ' '
+          },
+          'menus' => [
+            {
+              'cmdname' => 'menu',
+              'extra' => {
+                'end_command' => {
+                  'cmdname' => 'end',
+                  'extra' => {
+                    'command_argument' => 'menu',
+                    'spaces_before_argument' => ' ',
+                    'text_arg' => 'menu'
+                  }
+                }
+              }
+            }
+          ],
+          'structure' => {
+            'menu_child' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'rec_nodes'}{'menu_child'}{'menu_child'}{'menu_child'} = 
$result_nodes{'rec_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'rec_nodes'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'rec_nodes'}{'menu_child'};
-$result_nodes{'rec_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'rec_nodes'};
-$result_nodes{'rec_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'rec_nodes'};
-$result_nodes{'rec_nodes'}{'node_next'} = 
$result_nodes{'rec_nodes'}{'menu_child'};
+$result_nodes{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}
 = 
$result_nodes{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'rec_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'rec_nodes'};
+$result_nodes{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'} 
= $result_nodes{'rec_nodes'};
+$result_nodes{'rec_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'rec_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'rec_nodes'} = {
   'cmdname' => 'node',
@@ -1408,68 +1419,78 @@ $result_menus{'rec_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'other-node',
-        'spaces_before_argument' => ' '
-      },
-      'menu_child' => {},
-      'menu_next' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'other-node' => 1,
-        'second-node' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'node-following-second',
+        'normalized' => 'second-node',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'node-up-node-following-second',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'other-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {},
+            'menu_next' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'other-node' => 1,
+              'second-node' => 1
+            }
+          }
         },
-        'menu_child' => {},
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node-following-second',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_child' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'node-up-node-following-second',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_child' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'node-following-second' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1,
+              'node-up-node-following-second' => 1
+            }
+          }
+        },
+        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
-          'node-following-second' => 1
+          'Top' => 1,
+          'second-node' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1,
-        'node-up-node-following-second' => 1
       }
-    },
-    'menu_prev' => {},
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1,
-      'second-node' => 1
     }
   }
 };
-$result_menus{'rec_nodes'}{'menu_child'}{'menu_child'}{'menu_child'} = 
$result_menus{'rec_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'rec_nodes'}{'menu_child'}{'menu_child'}{'menu_next'} = 
$result_menus{'rec_nodes'}{'menu_child'};
-$result_menus{'rec_nodes'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'rec_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'rec_nodes'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_child'}
 = $result_menus{'rec_nodes'}{'menu_child'}{'menu_next'};
-$result_menus{'rec_nodes'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'} 
= $result_menus{'rec_nodes'}{'menu_child'}{'menu_next'};
-$result_menus{'rec_nodes'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'rec_nodes'}{'menu_child'};
-$result_menus{'rec_nodes'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'rec_nodes'}{'menu_child'}{'menu_next'}{'menu_child'};
-$result_menus{'rec_nodes'}{'menu_child'}{'menu_prev'} = 
$result_menus{'rec_nodes'}{'menu_child'}{'menu_child'};
-$result_menus{'rec_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'rec_nodes'}{'menu_child'};
+$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}
 = 
$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}
 = $result_menus{'rec_nodes'}{'structure'}{'menu_child'};
+$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}
 = 
$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'rec_nodes'}{'structure'}{'menu_child'};
+$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_prev'}
 = 
$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'rec_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} 
= $result_menus{'rec_nodes'}{'structure'}{'menu_child'};
 
 $result_errors{'rec_nodes'} = [];
 
diff --git a/tp/t/results/sectioning/ref_to_top.pl 
b/tp/t/results/sectioning/ref_to_top.pl
index 1beab7a58b..a0cf24978f 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -58,7 +58,8 @@ $result_trees{'ref_to_top'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -190,7 +191,8 @@ $result_sectioning{'ref_to_top'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -218,7 +220,8 @@ $result_nodes{'ref_to_top'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'ref_to_top'} = {
@@ -226,7 +229,8 @@ $result_menus{'ref_to_top'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'ref_to_top'} = [
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index 3fc9dd4688..17b96f0e3d 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -126,7 +126,8 @@ $result_trees{'section_before_after_top_node'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -294,7 +295,8 @@ $result_sectioning{'section_before_after_top_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -345,7 +347,8 @@ $result_nodes{'section_before_after_top_node'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'section_before_after_top_node'} = {
@@ -353,7 +356,8 @@ $result_menus{'section_before_after_top_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'section_before_after_top_node'} = [
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index bcec425db2..d031620be3 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -126,7 +126,8 @@ $result_trees{'section_before_after_top_node_last_node'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -263,7 +264,8 @@ $result_trees{'section_before_after_top_node_last_node'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -350,7 +352,8 @@ 
$result_sectioning{'section_before_after_top_node_last_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -402,23 +405,28 @@ $result_nodes{'section_before_after_top_node_last_node'} 
= {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node-after',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {}
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'node-after',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {}
+      }
+    }
   }
 };
-$result_nodes{'section_before_after_top_node_last_node'}{'node_next'}{'node_prev'}
 = $result_nodes{'section_before_after_top_node_last_node'};
+$result_nodes{'section_before_after_top_node_last_node'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'section_before_after_top_node_last_node'};
 
 $result_menus{'section_before_after_top_node_last_node'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'section_before_after_top_node_last_node'} = [
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index 8ea7e36fdf..0162153d2d 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -79,7 +79,8 @@ $result_trees{'section_before_top'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -160,7 +161,8 @@ $result_trees{'section_before_top'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -389,7 +391,8 @@ $result_sectioning{'section_before_top'} = {
             'extra' => {
               'normalized' => 'section-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -407,7 +410,8 @@ $result_sectioning{'section_before_top'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -441,25 +445,6 @@ $result_nodes{'section_before_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 2,
-          'number' => 1
-        }
-      },
-      'normalized' => 'section-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -475,11 +460,34 @@ $result_nodes{'section_before_top'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'section',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 2,
+            'number' => 1
+          }
+        },
+        'normalized' => 'section-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'section_before_top'}{'menu_child'}{'node_prev'} = 
$result_nodes{'section_before_top'};
-$result_nodes{'section_before_top'}{'menu_child'}{'node_up'} = 
$result_nodes{'section_before_top'};
-$result_nodes{'section_before_top'}{'node_next'} = 
$result_nodes{'section_before_top'}{'menu_child'};
+$result_nodes{'section_before_top'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'section_before_top'};
+$result_nodes{'section_before_top'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'section_before_top'};
+$result_nodes{'section_before_top'}{'structure'}{'node_next'} = 
$result_nodes{'section_before_top'}{'structure'}{'menu_child'};
 
 $result_menus{'section_before_top'} = {
   'cmdname' => 'node',
@@ -487,19 +495,23 @@ $result_menus{'section_before_top'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'section-node',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'section-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'section_before_top'}{'menu_child'}{'menu_up'} = 
$result_menus{'section_before_top'};
+$result_menus{'section_before_top'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'section_before_top'};
 
 $result_errors{'section_before_top'} = [
   {
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 6fc7905bae..53d7be904b 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -81,7 +81,8 @@ $result_trees{'section_below_unnumbered'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -300,7 +301,8 @@ $result_trees{'section_below_unnumbered'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -496,7 +498,8 @@ $result_trees{'section_below_unnumbered'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -710,7 +713,8 @@ $result_sectioning{'section_below_unnumbered'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -725,7 +729,8 @@ $result_sectioning{'section_below_unnumbered'} = {
                   'extra' => {
                     'normalized' => 'Unn',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -740,7 +745,8 @@ $result_sectioning{'section_below_unnumbered'} = {
                         'extra' => {
                           'normalized' => 'Sec',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -783,77 +789,83 @@ $result_nodes{'section_below_unnumbered'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'Unn',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'unnumbered',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2
+            'level' => 1
           }
         },
-        'normalized' => 'Sec',
+        'normalized' => 'Unn',
         'spaces_before_argument' => ' '
       },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
           }
         }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2
+              }
+            },
+            'normalized' => 'Sec',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_up' => {}
           }
-        }
+        },
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'section_below_unnumbered'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'section_below_unnumbered'}{'menu_child'};
-$result_nodes{'section_below_unnumbered'}{'menu_child'}{'node_prev'} = 
$result_nodes{'section_below_unnumbered'};
-$result_nodes{'section_below_unnumbered'}{'menu_child'}{'node_up'} = 
$result_nodes{'section_below_unnumbered'};
-$result_nodes{'section_below_unnumbered'}{'node_next'} = 
$result_nodes{'section_below_unnumbered'}{'menu_child'};
+$result_nodes{'section_below_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'section_below_unnumbered'}{'structure'}{'menu_child'};
+$result_nodes{'section_below_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'section_below_unnumbered'};
+$result_nodes{'section_below_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'section_below_unnumbered'};
+$result_nodes{'section_below_unnumbered'}{'structure'}{'node_next'} = 
$result_nodes{'section_below_unnumbered'}{'structure'}{'menu_child'};
 
 $result_menus{'section_below_unnumbered'} = {
   'cmdname' => 'node',
@@ -861,31 +873,37 @@ $result_menus{'section_below_unnumbered'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Unn',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Sec',
+        'normalized' => 'Unn',
         'spaces_before_argument' => ' '
       },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Unn' => 1
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Sec',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Unn' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'section_below_unnumbered'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'section_below_unnumbered'}{'menu_child'};
-$result_menus{'section_below_unnumbered'}{'menu_child'}{'menu_up'} = 
$result_menus{'section_below_unnumbered'};
+$result_menus{'section_below_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'section_below_unnumbered'}{'structure'}{'menu_child'};
+$result_menus{'section_below_unnumbered'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'section_below_unnumbered'};
 
 $result_errors{'section_below_unnumbered'} = [];
 
diff --git a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl 
b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
index 89442093c8..cb38c7b097 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -87,7 +87,8 @@ $result_trees{'section_chapter_before_top_nodes'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -168,7 +169,8 @@ $result_trees{'section_chapter_before_top_nodes'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -365,7 +367,8 @@ $result_trees{'section_chapter_before_top_nodes'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -644,7 +647,8 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
             'extra' => {
               'normalized' => 'section-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -662,7 +666,8 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
             'extra' => {
               'normalized' => 'chapter-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -682,7 +687,8 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -719,83 +725,89 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 2,
-          'number' => 2
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
             'level' => 2,
-            'number' => 1
+            'number' => 2
           }
         },
-        'normalized' => 'section-node',
+        'normalized' => 'chapter-node',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
           }
         }
-      }
-    ],
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => 1
+              }
+            },
+            'normalized' => 'section-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {},
+            'node_up' => {}
           }
-        }
+        },
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'menu_child'}{'node_next'}
 = $result_nodes{'section_chapter_before_top_nodes'}{'menu_child'};
-$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'section_chapter_before_top_nodes'}{'menu_child'};
-$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'node_next'} = 
$result_nodes{'section_chapter_before_top_nodes'};
-$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'node_prev'} = 
$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'menu_child'};
-$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'node_up'} = 
$result_nodes{'section_chapter_before_top_nodes'};
-$result_nodes{'section_chapter_before_top_nodes'}{'node_next'} = 
$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'};
+$result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = $result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = $result_nodes{'section_chapter_before_top_nodes'};
+$result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'section_chapter_before_top_nodes'};
+$result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'section_chapter_before_top_nodes'} = {
   'cmdname' => 'node',
@@ -803,31 +815,37 @@ $result_menus{'section_chapter_before_top_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-node',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section-node',
+        'normalized' => 'chapter-node',
         'spaces_before_argument' => ' '
       },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter-node' => 1
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'section-node',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'chapter-node' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'section_chapter_before_top_nodes'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'section_chapter_before_top_nodes'}{'menu_child'};
-$result_menus{'section_chapter_before_top_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'section_chapter_before_top_nodes'};
+$result_menus{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'};
+$result_menus{'section_chapter_before_top_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'section_chapter_before_top_nodes'};
 
 $result_errors{'section_chapter_before_top_nodes'} = [
   {
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl 
b/tp/t/results/sectioning/section_in_unnumbered_info.pl
index 0d38852640..02b1bfbe4a 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -58,7 +58,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -522,7 +523,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -719,7 +721,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -800,7 +803,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -996,7 +1000,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 34,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1076,7 +1081,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1330,7 +1336,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 45,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1697,7 +1704,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 55,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1777,7 +1785,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 58,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1857,7 +1866,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 61,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1937,7 +1947,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 64,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2017,7 +2028,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2213,7 +2225,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 74,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2299,7 +2312,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 78,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2724,7 +2738,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 89,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3091,7 +3106,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 99,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3171,7 +3187,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 102,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3251,7 +3268,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 105,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3331,7 +3349,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 108,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3411,7 +3430,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 111,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3492,7 +3512,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 114,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3688,7 +3709,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 121,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3768,7 +3790,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 124,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3965,7 +3988,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 131,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4046,7 +4070,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 134,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4242,7 +4267,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 141,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4322,7 +4348,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 144,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4518,7 +4545,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 151,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4885,7 +4913,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 161,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4965,7 +4994,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 164,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5045,7 +5075,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 167,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5125,7 +5156,8 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 170,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6205,7 +6237,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -6220,7 +6253,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6236,7 +6270,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'section-in-chapter',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6260,7 +6295,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'unnumbered',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6275,7 +6311,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'section-in-unnumbered',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6299,7 +6336,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'chapter-2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6315,7 +6353,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6330,7 +6369,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6347,7 +6387,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6365,7 +6406,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6383,7 +6425,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6405,7 +6448,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-2_002d1',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6420,7 +6464,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-2_002d1',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6449,7 +6494,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'chapter-3',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6465,7 +6511,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6480,7 +6527,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6497,7 +6545,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6515,7 +6564,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6533,7 +6583,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6555,7 +6606,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'section-3_002d1',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6574,7 +6626,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3_002d2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6589,7 +6642,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3_002d2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6611,7 +6665,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'section-3_002d3',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6627,7 +6682,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'subsection-3_002d3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6650,7 +6706,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3_002d4',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6665,7 +6722,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3_002d4',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6694,7 +6752,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'normalized' => 'unnumbered-4',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6709,7 +6768,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-4',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6724,7 +6784,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-4',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6741,7 +6802,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-4',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6759,7 +6821,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-4',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6777,7 +6840,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-4',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6881,87 +6945,38 @@ $result_nodes{'section_in_unnumbered_info'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
+  'menus' => [
+    {
+      'cmdname' => 'menu',
       'extra' => {
-        'associated_section' => {
-          'cmdname' => 'section',
+        'end_command' => {
+          'cmdname' => 'end',
           'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 2,
-            'number' => '1.1'
-          }
-        },
-        'normalized' => 'section-in-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
           }
         }
       }
-    ],
-    'node_next' => {
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'unnumbered',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'unnumbered',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2
-            }
-          },
-          'normalized' => 'section-in-unnumbered',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -6977,107 +6992,41 @@ $result_nodes{'section_in_unnumbered_info'} = {
           }
         }
       ],
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 2
-            }
-          },
-          'normalized' => 'chapter-2',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'unnumberedsec',
+              'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             },
-            'normalized' => 'unnumberedsec-2',
+            'normalized' => 'section-in-chapter',
             'spaces_before_argument' => ' '
           },
-          'menu_child' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumberedsubsec',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 3
-                }
-              },
-              'normalized' => 'unnumbered-sub-2',
-              'spaces_before_argument' => ' '
-            },
-            'node_next' => {
-              'cmdname' => 'node',
+          'structure' => {
+            'node_up' => {}
+          }
+        },
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'unnumbered',
               'extra' => {
-                'associated_section' => {
-                  'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'structure' => {
-                    'level' => 3
-                  }
-                },
-                'normalized' => 'numbered-sub-2',
                 'spaces_before_argument' => ' '
               },
-              'node_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'unnumberedsubsec',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 3
-                    }
-                  },
-                  'normalized' => 'unnumbered-sub2-2',
-                  'spaces_before_argument' => ' '
-                },
-                'node_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'associated_section' => {
-                      'cmdname' => 'subsection',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
-                      'structure' => {
-                        'level' => 3
-                      }
-                    },
-                    'normalized' => 'numbered-sub2-2',
-                    'spaces_before_argument' => ' '
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
-                },
-                'node_prev' => {},
-                'node_up' => {}
-              },
-              'node_prev' => {},
-              'node_up' => {}
+              'structure' => {
+                'level' => 1
+              }
             },
-            'node_up' => {}
+            'normalized' => 'unnumbered',
+            'spaces_before_argument' => ' '
           },
           'menus' => [
             {
@@ -7094,287 +7043,73 @@ $result_nodes{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumberedsec',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 2
-                }
-              },
-              'normalized' => 'unnumberedsec-2_002d1',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'associated_section' => {
-                  'cmdname' => 'subsection',
+                  'cmdname' => 'section',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
                   'structure' => {
-                    'level' => 3
+                    'level' => 2
                   }
                 },
-                'normalized' => 'numbered-sub-2_002d1',
-                'spaces_before_argument' => ' '
-              },
-              'node_up' => {}
-            },
-            'menus' => [
-              {
-                'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
-              }
-            ],
-            'node_prev' => {},
-            'node_up' => {}
-          },
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
-          }
-        ],
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'associated_section' => {
-              'cmdname' => 'chapter',
-              'extra' => {
+                'normalized' => 'section-in-unnumbered',
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3
+                'node_up' => {}
               }
             },
-            'normalized' => 'chapter-3',
-            'spaces_before_argument' => ' '
-          },
-          'menu_child' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumberedsec',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 2
-                }
-              },
-              'normalized' => 'unnumberedsec-3',
-              'spaces_before_argument' => ' '
-            },
-            'menu_child' => {
+            'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'associated_section' => {
-                  'cmdname' => 'unnumberedsubsec',
+                  'cmdname' => 'chapter',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
                   'structure' => {
-                    'level' => 3
+                    'level' => 1,
+                    'number' => 2
                   }
                 },
-                'normalized' => 'unnumbered-sub-3',
+                'normalized' => 'chapter-2',
                 'spaces_before_argument' => ' '
               },
-              'node_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'subsection',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 3
-                    }
-                  },
-                  'normalized' => 'numbered-sub-3',
-                  'spaces_before_argument' => ' '
-                },
-                'node_next' => {
-                  'cmdname' => 'node',
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
                   'extra' => {
-                    'associated_section' => {
-                      'cmdname' => 'unnumberedsubsec',
+                    'end_command' => {
+                      'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
-                      'structure' => {
-                        'level' => 3
-                      }
-                    },
-                    'normalized' => 'unnumbered-sub2-3',
-                    'spaces_before_argument' => ' '
-                  },
-                  'node_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'subsection',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 3
-                        }
-                      },
-                      'normalized' => 'numbered-sub2-3',
-                      'spaces_before_argument' => ' '
-                    },
-                    'node_prev' => {},
-                    'node_up' => {}
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
-                },
-                'node_prev' => {},
-                'node_up' => {}
-              },
-              'node_up' => {}
-            },
-            'menus' => [
-              {
-                'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
                     }
                   }
                 }
-              }
-            ],
-            'node_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'associated_section' => {
-                  'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'structure' => {
-                    'level' => 2,
-                    'number' => '3.1'
-                  }
-                },
-                'normalized' => 'section-3_002d1',
-                'spaces_before_argument' => ' '
-              },
-              'node_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'unnumberedsec',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 2
-                    }
-                  },
-                  'normalized' => 'unnumberedsec-3_002d2',
-                  'spaces_before_argument' => ' '
-                },
+              ],
+              'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'associated_section' => {
-                      'cmdname' => 'subsection',
+                      'cmdname' => 'unnumberedsec',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
                       'structure' => {
-                        'level' => 3
+                        'level' => 2
                       }
                     },
-                    'normalized' => 'numbered-sub-3_002d2',
+                    'normalized' => 'unnumberedsec-2',
                     'spaces_before_argument' => ' '
                   },
-                  'node_up' => {}
-                },
-                'menus' => [
-                  {
-                    'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
-                  }
-                ],
-                'node_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'associated_section' => {
-                      'cmdname' => 'section',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
-                      'structure' => {
-                        'level' => 2,
-                        'number' => '3.2'
-                      }
-                    },
-                    'normalized' => 'section-3_002d3',
-                    'spaces_before_argument' => ' '
-                  },
-                  'menu_child' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'subsection',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 3,
-                          'number' => '3.2.1'
-                        }
-                      },
-                      'normalized' => 'subsection-3_002d3',
-                      'spaces_before_argument' => ' '
-                    },
-                    'node_up' => {}
-                  },
                   'menus' => [
                     {
                       'cmdname' => 'menu',
@@ -7390,26 +7125,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                       }
                     }
                   ],
-                  'node_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'unnumberedsec',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 2
-                        }
-                      },
-                      'normalized' => 'unnumberedsec-3_002d4',
-                      'spaces_before_argument' => ' '
-                    },
+                  'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'associated_section' => {
-                          'cmdname' => 'subsection',
+                          'cmdname' => 'unnumberedsubsec',
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
@@ -7417,271 +7138,678 @@ $result_nodes{'section_in_unnumbered_info'} = {
                             'level' => 3
                           }
                         },
-                        'normalized' => 'numbered-sub-3_002d4',
+                        'normalized' => 'unnumbered-sub-2',
                         'spaces_before_argument' => ' '
                       },
-                      'node_up' => {}
+                      'structure' => {
+                        'node_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'subsection',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 3
+                              }
+                            },
+                            'normalized' => 'numbered-sub-2',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'associated_section' => {
+                                  'cmdname' => 'unnumberedsubsec',
+                                  'extra' => {
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'level' => 3
+                                  }
+                                },
+                                'normalized' => 'unnumbered-sub2-2',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'node_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'associated_section' => {
+                                      'cmdname' => 'subsection',
+                                      'extra' => {
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'level' => 3
+                                      }
+                                    },
+                                    'normalized' => 'numbered-sub2-2',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'node_prev' => {},
+                                    'node_up' => {}
+                                  }
+                                },
+                                'node_prev' => {},
+                                'node_up' => {}
+                              }
+                            },
+                            'node_prev' => {},
+                            'node_up' => {}
+                          }
+                        },
+                        'node_up' => {}
+                      }
                     },
-                    'menus' => [
-                      {
-                        'cmdname' => 'menu',
-                        'extra' => {
-                          'end_command' => {
-                            'cmdname' => 'end',
-                            'extra' => {
-                              'command_argument' => 'menu',
-                              'spaces_before_argument' => ' ',
-                              'text_arg' => 'menu'
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'unnumberedsec',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 2
+                          }
+                        },
+                        'normalized' => 'unnumberedsec-2_002d1',
+                        'spaces_before_argument' => ' '
+                      },
+                      'menus' => [
+                        {
+                          'cmdname' => 'menu',
+                          'extra' => {
+                            'end_command' => {
+                              'cmdname' => 'end',
+                              'extra' => {
+                                'command_argument' => 'menu',
+                                'spaces_before_argument' => ' ',
+                                'text_arg' => 'menu'
+                              }
                             }
                           }
                         }
+                      ],
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'subsection',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 3
+                              }
+                            },
+                            'normalized' => 'numbered-sub-2_002d1',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_up' => {}
+                          }
+                        },
+                        'node_prev' => {},
+                        'node_up' => {}
                       }
-                    ],
-                    'node_prev' => {},
+                    },
                     'node_up' => {}
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
-                },
-                'node_prev' => {},
-                'node_up' => {}
-              },
-              'node_prev' => {},
-              'node_up' => {}
-            },
-            'node_up' => {}
-          },
-          'menus' => [
-            {
-              'cmdname' => 'menu',
-              'extra' => {
-                'end_command' => {
-                  'cmdname' => 'end',
-                  'extra' => {
-                    'command_argument' => 'menu',
-                    'spaces_before_argument' => ' ',
-                    'text_arg' => 'menu'
                   }
-                }
-              }
-            }
-          ],
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumbered',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 1
-                }
-              },
-              'normalized' => 'unnumbered-4',
-              'spaces_before_argument' => ' '
-            },
-            'menu_child' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'associated_section' => {
-                  'cmdname' => 'unnumberedsec',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'structure' => {
-                    'level' => 2
-                  }
-                },
-                'normalized' => 'unnumberedsec-4',
-                'spaces_before_argument' => ' '
-              },
-              'menu_child' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'unnumberedsubsec',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 3
-                    }
-                  },
-                  'normalized' => 'unnumbered-sub-4',
-                  'spaces_before_argument' => ' '
                 },
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'associated_section' => {
-                      'cmdname' => 'subsection',
+                      'cmdname' => 'chapter',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
                       'structure' => {
-                        'level' => 3
+                        'level' => 1,
+                        'number' => 3
                       }
                     },
-                    'normalized' => 'numbered-sub-4',
+                    'normalized' => 'chapter-3',
                     'spaces_before_argument' => ' '
                   },
-                  'node_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'unnumberedsubsec',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 3
+                  'menus' => [
+                    {
+                      'cmdname' => 'menu',
+                      'extra' => {
+                        'end_command' => {
+                          'cmdname' => 'end',
+                          'extra' => {
+                            'command_argument' => 'menu',
+                            'spaces_before_argument' => ' ',
+                            'text_arg' => 'menu'
+                          }
                         }
+                      }
+                    }
+                  ],
+                  'structure' => {
+                    'menu_child' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'unnumberedsec',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 2
+                          }
+                        },
+                        'normalized' => 'unnumberedsec-3',
+                        'spaces_before_argument' => ' '
                       },
-                      'normalized' => 'unnumbered-sub2-4',
-                      'spaces_before_argument' => ' '
+                      'menus' => [
+                        {
+                          'cmdname' => 'menu',
+                          'extra' => {
+                            'end_command' => {
+                              'cmdname' => 'end',
+                              'extra' => {
+                                'command_argument' => 'menu',
+                                'spaces_before_argument' => ' ',
+                                'text_arg' => 'menu'
+                              }
+                            }
+                          }
+                        }
+                      ],
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'unnumberedsubsec',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 3
+                              }
+                            },
+                            'normalized' => 'unnumbered-sub-3',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'associated_section' => {
+                                  'cmdname' => 'subsection',
+                                  'extra' => {
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'level' => 3
+                                  }
+                                },
+                                'normalized' => 'numbered-sub-3',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'node_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'associated_section' => {
+                                      'cmdname' => 'unnumberedsubsec',
+                                      'extra' => {
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'level' => 3
+                                      }
+                                    },
+                                    'normalized' => 'unnumbered-sub2-3',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'node_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'associated_section' => {
+                                          'cmdname' => 'subsection',
+                                          'extra' => {
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'level' => 3
+                                          }
+                                        },
+                                        'normalized' => 'numbered-sub2-3',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'node_prev' => {},
+                                        'node_up' => {}
+                                      }
+                                    },
+                                    'node_prev' => {},
+                                    'node_up' => {}
+                                  }
+                                },
+                                'node_prev' => {},
+                                'node_up' => {}
+                              }
+                            },
+                            'node_up' => {}
+                          }
+                        },
+                        'node_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'section',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 2,
+                                'number' => '3.1'
+                              }
+                            },
+                            'normalized' => 'section-3_002d1',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'associated_section' => {
+                                  'cmdname' => 'unnumberedsec',
+                                  'extra' => {
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'level' => 2
+                                  }
+                                },
+                                'normalized' => 'unnumberedsec-3_002d2',
+                                'spaces_before_argument' => ' '
+                              },
+                              'menus' => [
+                                {
+                                  'cmdname' => 'menu',
+                                  'extra' => {
+                                    'end_command' => {
+                                      'cmdname' => 'end',
+                                      'extra' => {
+                                        'command_argument' => 'menu',
+                                        'spaces_before_argument' => ' ',
+                                        'text_arg' => 'menu'
+                                      }
+                                    }
+                                  }
+                                }
+                              ],
+                              'structure' => {
+                                'menu_child' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'associated_section' => {
+                                      'cmdname' => 'subsection',
+                                      'extra' => {
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'level' => 3
+                                      }
+                                    },
+                                    'normalized' => 'numbered-sub-3_002d2',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'node_up' => {}
+                                  }
+                                },
+                                'node_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'associated_section' => {
+                                      'cmdname' => 'section',
+                                      'extra' => {
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'level' => 2,
+                                        'number' => '3.2'
+                                      }
+                                    },
+                                    'normalized' => 'section-3_002d3',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'menus' => [
+                                    {
+                                      'cmdname' => 'menu',
+                                      'extra' => {
+                                        'end_command' => {
+                                          'cmdname' => 'end',
+                                          'extra' => {
+                                            'command_argument' => 'menu',
+                                            'spaces_before_argument' => ' ',
+                                            'text_arg' => 'menu'
+                                          }
+                                        }
+                                      }
+                                    }
+                                  ],
+                                  'structure' => {
+                                    'menu_child' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'associated_section' => {
+                                          'cmdname' => 'subsection',
+                                          'extra' => {
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'level' => 3,
+                                            'number' => '3.2.1'
+                                          }
+                                        },
+                                        'normalized' => 'subsection-3_002d3',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'node_up' => {}
+                                      }
+                                    },
+                                    'node_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'associated_section' => {
+                                          'cmdname' => 'unnumberedsec',
+                                          'extra' => {
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'level' => 2
+                                          }
+                                        },
+                                        'normalized' => 
'unnumberedsec-3_002d4',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'menus' => [
+                                        {
+                                          'cmdname' => 'menu',
+                                          'extra' => {
+                                            'end_command' => {
+                                              'cmdname' => 'end',
+                                              'extra' => {
+                                                'command_argument' => 'menu',
+                                                'spaces_before_argument' => ' 
',
+                                                'text_arg' => 'menu'
+                                              }
+                                            }
+                                          }
+                                        }
+                                      ],
+                                      'structure' => {
+                                        'menu_child' => {
+                                          'cmdname' => 'node',
+                                          'extra' => {
+                                            'associated_section' => {
+                                              'cmdname' => 'subsection',
+                                              'extra' => {
+                                                'spaces_before_argument' => ' '
+                                              },
+                                              'structure' => {
+                                                'level' => 3
+                                              }
+                                            },
+                                            'normalized' => 
'numbered-sub-3_002d4',
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'node_up' => {}
+                                          }
+                                        },
+                                        'node_prev' => {},
+                                        'node_up' => {}
+                                      }
+                                    },
+                                    'node_prev' => {},
+                                    'node_up' => {}
+                                  }
+                                },
+                                'node_prev' => {},
+                                'node_up' => {}
+                              }
+                            },
+                            'node_prev' => {},
+                            'node_up' => {}
+                          }
+                        },
+                        'node_up' => {}
+                      }
                     },
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'associated_section' => {
-                          'cmdname' => 'subsection',
+                          'cmdname' => 'unnumbered',
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
                           'structure' => {
-                            'level' => 3
+                            'level' => 1
                           }
                         },
-                        'normalized' => 'numbered-sub2-4',
+                        'normalized' => 'unnumbered-4',
                         'spaces_before_argument' => ' '
                       },
-                      'node_prev' => {},
-                      'node_up' => {}
-                    },
-                    'node_prev' => {},
-                    'node_up' => {}
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
-                },
-                'node_up' => {}
-              },
-              'menus' => [
-                {
-                  'cmdname' => 'menu',
-                  'extra' => {
-                    'end_command' => {
-                      'cmdname' => 'end',
-                      'extra' => {
-                        'command_argument' => 'menu',
-                        'spaces_before_argument' => ' ',
-                        'text_arg' => 'menu'
-                      }
-                    }
-                  }
-                }
-              ],
-              'node_up' => {}
-            },
-            'menus' => [
-              {
-                'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
+                      'menus' => [
+                        {
+                          'cmdname' => 'menu',
+                          'extra' => {
+                            'end_command' => {
+                              'cmdname' => 'end',
+                              'extra' => {
+                                'command_argument' => 'menu',
+                                'spaces_before_argument' => ' ',
+                                'text_arg' => 'menu'
+                              }
+                            }
+                          }
+                        }
+                      ],
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'unnumberedsec',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 2
+                              }
+                            },
+                            'normalized' => 'unnumberedsec-4',
+                            'spaces_before_argument' => ' '
+                          },
+                          'menus' => [
+                            {
+                              'cmdname' => 'menu',
+                              'extra' => {
+                                'end_command' => {
+                                  'cmdname' => 'end',
+                                  'extra' => {
+                                    'command_argument' => 'menu',
+                                    'spaces_before_argument' => ' ',
+                                    'text_arg' => 'menu'
+                                  }
+                                }
+                              }
+                            }
+                          ],
+                          'structure' => {
+                            'menu_child' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'associated_section' => {
+                                  'cmdname' => 'unnumberedsubsec',
+                                  'extra' => {
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'level' => 3
+                                  }
+                                },
+                                'normalized' => 'unnumbered-sub-4',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'node_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'associated_section' => {
+                                      'cmdname' => 'subsection',
+                                      'extra' => {
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'level' => 3
+                                      }
+                                    },
+                                    'normalized' => 'numbered-sub-4',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'node_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'associated_section' => {
+                                          'cmdname' => 'unnumberedsubsec',
+                                          'extra' => {
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'level' => 3
+                                          }
+                                        },
+                                        'normalized' => 'unnumbered-sub2-4',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'node_next' => {
+                                          'cmdname' => 'node',
+                                          'extra' => {
+                                            'associated_section' => {
+                                              'cmdname' => 'subsection',
+                                              'extra' => {
+                                                'spaces_before_argument' => ' '
+                                              },
+                                              'structure' => {
+                                                'level' => 3
+                                              }
+                                            },
+                                            'normalized' => 'numbered-sub2-4',
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'node_prev' => {},
+                                            'node_up' => {}
+                                          }
+                                        },
+                                        'node_prev' => {},
+                                        'node_up' => {}
+                                      }
+                                    },
+                                    'node_prev' => {},
+                                    'node_up' => {}
+                                  }
+                                },
+                                'node_up' => {}
+                              }
+                            },
+                            'node_up' => {}
+                          }
+                        },
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
                   }
-                }
+                },
+                'node_prev' => {},
+                'node_up' => {}
               }
-            ],
+            },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'section_in_unnumbered_info'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_prev'} = 
$result_nodes{'section_in_unnumbered_info'};
-$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_up'} = 
$result_nodes{'section_in_unnumbered_info'};
-$result_nodes{'section_in_unnumbered_info'}{'node_next'} = 
$result_nodes{'section_in_unnumbered_info'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'struc
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'struct
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'struc
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structur
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structur
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structu
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structu
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structu
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structu
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'struct
 [...]
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'section_in_unnumbered_info'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_info'};
+$result_nodes{'section_in_unnumbered_info'}{'structure'}{'node_next'} = 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'menu_child'};
 
 $result_menus{'section_in_unnumbered_info'} = {
   'cmdname' => 'node',
@@ -7689,334 +7817,413 @@ $result_menus{'section_in_unnumbered_info'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section-in-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'unnumbered',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'section-in-unnumbered',
-          'spaces_before_argument' => ' '
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'unnumbered' => 1
-        }
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'chapter-2',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'unnumberedsec-2',
+            'normalized' => 'section-in-chapter',
             'spaces_before_argument' => ' '
           },
-          'menu_child' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumbered-sub-2',
-              'spaces_before_argument' => ' '
-            },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'numbered-sub-2',
-                'spaces_before_argument' => ' '
-              },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'unnumbered-sub2-2',
-                  'spaces_before_argument' => ' '
-                },
-                'menu_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'normalized' => 'numbered-sub2-2',
-                    'spaces_before_argument' => ' '
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'unnumberedsec-2' => 1
-                  }
-                },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'unnumberedsec-2' => 1
-                }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumberedsec-2' => 1
-              }
-            },
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'unnumberedsec-2' => 1
-            }
-          },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumberedsec-2_002d1',
-              'spaces_before_argument' => ' '
-            },
-            'menu_child' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'numbered-sub-2_002d1',
-                'spaces_before_argument' => ' '
-              },
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumberedsec-2_002d1' => 1
-              }
-            },
-            'menu_prev' => {},
+          'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
-              'chapter-2' => 1
+              'chapter' => 1
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'chapter-2' => 1
           }
         },
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'chapter-3',
+            'normalized' => 'unnumbered',
             'spaces_before_argument' => ' '
           },
-          'menu_child' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumberedsec-3',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'unnumbered-sub-3',
+                'normalized' => 'section-in-unnumbered',
                 'spaces_before_argument' => ' '
               },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'numbered-sub-3',
-                  'spaces_before_argument' => ' '
-                },
-                'menu_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'normalized' => 'unnumbered-sub2-3',
-                    'spaces_before_argument' => ' '
-                  },
-                  'menu_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 'numbered-sub2-3',
-                      'spaces_before_argument' => ' '
-                    },
-                    'menu_prev' => {},
-                    'menu_up' => {},
-                    'menu_up_hash' => {
-                      'unnumberedsec-3' => 1
-                    }
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'unnumberedsec-3' => 1
-                  }
-                },
-                'menu_prev' => {},
+              'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
-                  'unnumberedsec-3' => 1
+                  'unnumbered' => 1
                 }
-              },
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumberedsec-3' => 1
               }
             },
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'section-3_002d1',
+                'normalized' => 'chapter-2',
                 'spaces_before_argument' => ' '
               },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'unnumberedsec-3_002d2',
-                  'spaces_before_argument' => ' '
-                },
+              'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'numbered-sub-3_002d2',
-                    'spaces_before_argument' => ' '
-                  },
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'unnumberedsec-3_002d2' => 1
-                  }
-                },
-                'menu_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'normalized' => 'section-3_002d3',
+                    'normalized' => 'unnumberedsec-2',
                     'spaces_before_argument' => ' '
                   },
-                  'menu_child' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 'subsection-3_002d3',
-                      'spaces_before_argument' => ' '
-                    },
-                    'menu_up' => {},
-                    'menu_up_hash' => {
-                      'section-3_002d3' => 1
-                    }
-                  },
-                  'menu_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 'unnumberedsec-3_002d4',
-                      'spaces_before_argument' => ' '
-                    },
+                  'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'numbered-sub-3_002d4',
+                        'normalized' => 'unnumbered-sub-2',
                         'spaces_before_argument' => ' '
                       },
-                      'menu_up' => {},
-                      'menu_up_hash' => {
-                        'unnumberedsec-3_002d4' => 1
+                      'structure' => {
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'numbered-sub-2',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'normalized' => 'unnumbered-sub2-2',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'menu_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'normalized' => 'numbered-sub2-2',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'menu_prev' => {},
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'unnumberedsec-2' => 1
+                                    }
+                                  }
+                                },
+                                'menu_prev' => {},
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'unnumberedsec-2' => 1
+                                }
+                              }
+                            },
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumberedsec-2' => 1
+                            }
+                          }
+                        },
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'unnumberedsec-2' => 1
+                        }
+                      }
+                    },
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'unnumberedsec-2_002d1',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'numbered-sub-2_002d1',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumberedsec-2_002d1' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'chapter-2' => 1
+                        }
                       }
                     },
-                    'menu_prev' => {},
                     'menu_up' => {},
                     'menu_up_hash' => {
-                      'chapter-3' => 1
+                      'chapter-2' => 1
                     }
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'chapter-3' => 1
                   }
                 },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'chapter-3' => 1
-                }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'chapter-3' => 1
-              }
-            },
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'chapter-3' => 1
-            }
-          },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumbered-4',
-              'spaces_before_argument' => ' '
-            },
-            'menu_child' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'unnumberedsec-4',
-                'spaces_before_argument' => ' '
-              },
-              'menu_child' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'unnumbered-sub-4',
-                  'spaces_before_argument' => ' '
-                },
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'numbered-sub-4',
+                    'normalized' => 'chapter-3',
                     'spaces_before_argument' => ' '
                   },
-                  'menu_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 'unnumbered-sub2-4',
-                      'spaces_before_argument' => ' '
+                  'structure' => {
+                    'menu_child' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'unnumberedsec-3',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'unnumbered-sub-3',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'normalized' => 'numbered-sub-3',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'menu_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'normalized' => 'unnumbered-sub2-3',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'menu_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'normalized' => 'numbered-sub2-3',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'menu_prev' => {},
+                                        'menu_up' => {},
+                                        'menu_up_hash' => {
+                                          'unnumberedsec-3' => 1
+                                        }
+                                      }
+                                    },
+                                    'menu_prev' => {},
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'unnumberedsec-3' => 1
+                                    }
+                                  }
+                                },
+                                'menu_prev' => {},
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'unnumberedsec-3' => 1
+                                }
+                              }
+                            },
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumberedsec-3' => 1
+                            }
+                          }
+                        },
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'section-3_002d1',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'normalized' => 'unnumberedsec-3_002d2',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'menu_child' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'normalized' => 'numbered-sub-3_002d2',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'unnumberedsec-3_002d2' => 1
+                                    }
+                                  }
+                                },
+                                'menu_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'normalized' => 'section-3_002d3',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'menu_child' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'normalized' => 'subsection-3_002d3',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'menu_up' => {},
+                                        'menu_up_hash' => {
+                                          'section-3_002d3' => 1
+                                        }
+                                      }
+                                    },
+                                    'menu_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'normalized' => 
'unnumberedsec-3_002d4',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'menu_child' => {
+                                          'cmdname' => 'node',
+                                          'extra' => {
+                                            'normalized' => 
'numbered-sub-3_002d4',
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'menu_up' => {},
+                                            'menu_up_hash' => {
+                                              'unnumberedsec-3_002d4' => 1
+                                            }
+                                          }
+                                        },
+                                        'menu_prev' => {},
+                                        'menu_up' => {},
+                                        'menu_up_hash' => {
+                                          'chapter-3' => 1
+                                        }
+                                      }
+                                    },
+                                    'menu_prev' => {},
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'chapter-3' => 1
+                                    }
+                                  }
+                                },
+                                'menu_prev' => {},
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'chapter-3' => 1
+                                }
+                              }
+                            },
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'chapter-3' => 1
+                            }
+                          }
+                        },
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'chapter-3' => 1
+                        }
+                      }
                     },
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'numbered-sub2-4',
+                        'normalized' => 'unnumbered-4',
                         'spaces_before_argument' => ' '
                       },
-                      'menu_prev' => {},
-                      'menu_up' => {},
-                      'menu_up_hash' => {
-                        'unnumberedsec-4' => 1
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'unnumberedsec-4',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_child' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'normalized' => 'unnumbered-sub-4',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'menu_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'normalized' => 'numbered-sub-4',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'menu_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'normalized' => 'unnumbered-sub2-4',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'menu_next' => {
+                                          'cmdname' => 'node',
+                                          'extra' => {
+                                            'normalized' => 'numbered-sub2-4',
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'menu_prev' => {},
+                                            'menu_up' => {},
+                                            'menu_up_hash' => {
+                                              'unnumberedsec-4' => 1
+                                            }
+                                          }
+                                        },
+                                        'menu_prev' => {},
+                                        'menu_up' => {},
+                                        'menu_up_hash' => {
+                                          'unnumberedsec-4' => 1
+                                        }
+                                      }
+                                    },
+                                    'menu_prev' => {},
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'unnumberedsec-4' => 1
+                                    }
+                                  }
+                                },
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'unnumberedsec-4' => 1
+                                }
+                              }
+                            },
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumbered-4' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
                       }
                     },
                     'menu_prev' => {},
                     'menu_up' => {},
                     'menu_up_hash' => {
-                      'unnumberedsec-4' => 1
+                      'Top' => 1
                     }
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'unnumberedsec-4' => 1
                   }
                 },
+                'menu_prev' => {},
                 'menu_up' => {},
                 'menu_up_hash' => {
-                  'unnumberedsec-4' => 1
+                  'Top' => 1
                 }
-              },
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumbered-4' => 1
               }
             },
             'menu_prev' => {},
@@ -8024,80 +8231,65 @@ $result_menus{'section_in_unnumbered_info'} = {
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'section_in_unnumbered_info'}{'menu_child'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'};
-$result_menus{'section_in_unnumbered_info'}{'menu_child'}{'menu_up'} = 
$result_menus{'section_in_unnumbered_info'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'struc
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'struct
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'struc
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structur
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structur
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structu
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structu
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structu
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structu
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'struct
 [...]
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'};
+$result_menus{'section_in_unnumbered_info'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_info'};
 
 $result_errors{'section_in_unnumbered_info'} = [];
 
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index 5e94711018..b71fa388f6 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -58,7 +58,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -522,7 +523,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -719,7 +721,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -800,7 +803,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -996,7 +1000,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 34,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1076,7 +1081,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1330,7 +1336,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 45,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1697,7 +1704,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 55,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1777,7 +1785,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 58,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1857,7 +1866,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 61,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1937,7 +1947,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 64,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2017,7 +2028,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2213,7 +2225,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 74,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2299,7 +2312,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 78,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -2724,7 +2738,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 89,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3091,7 +3106,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 99,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3171,7 +3187,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 102,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3251,7 +3268,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 105,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3331,7 +3349,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 108,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3411,7 +3430,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 111,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3492,7 +3512,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 114,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3688,7 +3709,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 121,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3768,7 +3790,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 124,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3965,7 +3988,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 131,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4046,7 +4070,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 134,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4242,7 +4267,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 141,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4322,7 +4348,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 144,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4518,7 +4545,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 151,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4885,7 +4913,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 161,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -4965,7 +4994,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 164,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5045,7 +5075,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 167,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -5125,7 +5156,8 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 170,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -6205,7 +6237,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -6220,7 +6253,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6236,7 +6270,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'section-in-chapter',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6260,7 +6295,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'unnumbered',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6275,7 +6311,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'section-in-unnumbered',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6299,7 +6336,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'chapter-2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6315,7 +6353,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6330,7 +6369,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6347,7 +6387,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6365,7 +6406,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6383,7 +6425,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6405,7 +6448,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-2_002d1',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6420,7 +6464,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-2_002d1',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6449,7 +6494,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'chapter-3',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6465,7 +6511,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6480,7 +6527,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6497,7 +6545,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6515,7 +6564,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6533,7 +6583,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6555,7 +6606,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'section-3_002d1',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6574,7 +6626,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3_002d2',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6589,7 +6642,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3_002d2',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6611,7 +6665,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'section-3_002d3',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6627,7 +6682,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'subsection-3_002d3',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6650,7 +6706,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-3_002d4',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6665,7 +6722,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-3_002d4',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6694,7 +6752,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'normalized' => 'unnumbered-4',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -6709,7 +6768,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'normalized' => 'unnumberedsec-4',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -6724,7 +6784,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub-4',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6741,7 +6802,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub-4',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6759,7 +6821,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'unnumbered-sub2-4',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6777,7 +6840,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'normalized' => 'numbered-sub2-4',
                                 'spaces_before_argument' => ' '
-                              }
+                              },
+                              'structure' => {}
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -6881,87 +6945,38 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
+  'menus' => [
+    {
+      'cmdname' => 'menu',
       'extra' => {
-        'associated_section' => {
-          'cmdname' => 'section',
+        'end_command' => {
+          'cmdname' => 'end',
           'extra' => {
-            'spaces_before_argument' => ' '
-          },
-          'structure' => {
-            'level' => 2,
-            'number' => '1.1'
-          }
-        },
-        'normalized' => 'section-in-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
           }
         }
       }
-    ],
-    'node_next' => {
+    }
+  ],
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'unnumbered',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'unnumbered',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2
-            }
-          },
-          'normalized' => 'section-in-unnumbered',
-          'spaces_before_argument' => ' '
-        },
-        'node_up' => {}
-      },
       'menus' => [
         {
           'cmdname' => 'menu',
@@ -6977,107 +6992,41 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
           }
         }
       ],
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 2
-            }
-          },
-          'normalized' => 'chapter-2',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'associated_section' => {
-              'cmdname' => 'unnumberedsec',
+              'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             },
-            'normalized' => 'unnumberedsec-2',
+            'normalized' => 'section-in-chapter',
             'spaces_before_argument' => ' '
           },
-          'menu_child' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumberedsubsec',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 3
-                }
-              },
-              'normalized' => 'unnumbered-sub-2',
-              'spaces_before_argument' => ' '
-            },
-            'node_next' => {
-              'cmdname' => 'node',
+          'structure' => {
+            'node_up' => {}
+          }
+        },
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'unnumbered',
               'extra' => {
-                'associated_section' => {
-                  'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'structure' => {
-                    'level' => 3
-                  }
-                },
-                'normalized' => 'numbered-sub-2',
                 'spaces_before_argument' => ' '
               },
-              'node_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'unnumberedsubsec',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 3
-                    }
-                  },
-                  'normalized' => 'unnumbered-sub2-2',
-                  'spaces_before_argument' => ' '
-                },
-                'node_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'associated_section' => {
-                      'cmdname' => 'subsection',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
-                      'structure' => {
-                        'level' => 3
-                      }
-                    },
-                    'normalized' => 'numbered-sub2-2',
-                    'spaces_before_argument' => ' '
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
-                },
-                'node_prev' => {},
-                'node_up' => {}
-              },
-              'node_prev' => {},
-              'node_up' => {}
+              'structure' => {
+                'level' => 1
+              }
             },
-            'node_up' => {}
+            'normalized' => 'unnumbered',
+            'spaces_before_argument' => ' '
           },
           'menus' => [
             {
@@ -7094,287 +7043,73 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumberedsec',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 2
-                }
-              },
-              'normalized' => 'unnumberedsec-2_002d1',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'associated_section' => {
-                  'cmdname' => 'subsection',
+                  'cmdname' => 'section',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
                   'structure' => {
-                    'level' => 3
+                    'level' => 2
                   }
                 },
-                'normalized' => 'numbered-sub-2_002d1',
-                'spaces_before_argument' => ' '
-              },
-              'node_up' => {}
-            },
-            'menus' => [
-              {
-                'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
-              }
-            ],
-            'node_prev' => {},
-            'node_up' => {}
-          },
-          'node_up' => {}
-        },
-        'menus' => [
-          {
-            'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
-          }
-        ],
-        'node_next' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'associated_section' => {
-              'cmdname' => 'chapter',
-              'extra' => {
+                'normalized' => 'section-in-unnumbered',
                 'spaces_before_argument' => ' '
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3
+                'node_up' => {}
               }
             },
-            'normalized' => 'chapter-3',
-            'spaces_before_argument' => ' '
-          },
-          'menu_child' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumberedsec',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 2
-                }
-              },
-              'normalized' => 'unnumberedsec-3',
-              'spaces_before_argument' => ' '
-            },
-            'menu_child' => {
+            'node_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'associated_section' => {
-                  'cmdname' => 'unnumberedsubsec',
+                  'cmdname' => 'chapter',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
                   'structure' => {
-                    'level' => 3
+                    'level' => 1,
+                    'number' => 2
                   }
                 },
-                'normalized' => 'unnumbered-sub-3',
+                'normalized' => 'chapter-2',
                 'spaces_before_argument' => ' '
               },
-              'node_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'subsection',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 3
-                    }
-                  },
-                  'normalized' => 'numbered-sub-3',
-                  'spaces_before_argument' => ' '
-                },
-                'node_next' => {
-                  'cmdname' => 'node',
+              'menus' => [
+                {
+                  'cmdname' => 'menu',
                   'extra' => {
-                    'associated_section' => {
-                      'cmdname' => 'unnumberedsubsec',
+                    'end_command' => {
+                      'cmdname' => 'end',
                       'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
-                      'structure' => {
-                        'level' => 3
-                      }
-                    },
-                    'normalized' => 'unnumbered-sub2-3',
-                    'spaces_before_argument' => ' '
-                  },
-                  'node_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'subsection',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 3
-                        }
-                      },
-                      'normalized' => 'numbered-sub2-3',
-                      'spaces_before_argument' => ' '
-                    },
-                    'node_prev' => {},
-                    'node_up' => {}
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
-                },
-                'node_prev' => {},
-                'node_up' => {}
-              },
-              'node_up' => {}
-            },
-            'menus' => [
-              {
-                'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
+                        'command_argument' => 'menu',
+                        'spaces_before_argument' => ' ',
+                        'text_arg' => 'menu'
+                      }
                     }
                   }
                 }
-              }
-            ],
-            'node_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'associated_section' => {
-                  'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'structure' => {
-                    'level' => 2,
-                    'number' => '3.1'
-                  }
-                },
-                'normalized' => 'section-3_002d1',
-                'spaces_before_argument' => ' '
-              },
-              'node_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'unnumberedsec',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 2
-                    }
-                  },
-                  'normalized' => 'unnumberedsec-3_002d2',
-                  'spaces_before_argument' => ' '
-                },
+              ],
+              'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'associated_section' => {
-                      'cmdname' => 'subsection',
+                      'cmdname' => 'unnumberedsec',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
                       'structure' => {
-                        'level' => 3
+                        'level' => 2
                       }
                     },
-                    'normalized' => 'numbered-sub-3_002d2',
+                    'normalized' => 'unnumberedsec-2',
                     'spaces_before_argument' => ' '
                   },
-                  'node_up' => {}
-                },
-                'menus' => [
-                  {
-                    'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
-                  }
-                ],
-                'node_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'associated_section' => {
-                      'cmdname' => 'section',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
-                      'structure' => {
-                        'level' => 2,
-                        'number' => '3.2'
-                      }
-                    },
-                    'normalized' => 'section-3_002d3',
-                    'spaces_before_argument' => ' '
-                  },
-                  'menu_child' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'subsection',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 3,
-                          'number' => '3.2.1'
-                        }
-                      },
-                      'normalized' => 'subsection-3_002d3',
-                      'spaces_before_argument' => ' '
-                    },
-                    'node_up' => {}
-                  },
                   'menus' => [
                     {
                       'cmdname' => 'menu',
@@ -7390,26 +7125,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                       }
                     }
                   ],
-                  'node_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'unnumberedsec',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 2
-                        }
-                      },
-                      'normalized' => 'unnumberedsec-3_002d4',
-                      'spaces_before_argument' => ' '
-                    },
+                  'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'associated_section' => {
-                          'cmdname' => 'subsection',
+                          'cmdname' => 'unnumberedsubsec',
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
@@ -7417,271 +7138,678 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                             'level' => 3
                           }
                         },
-                        'normalized' => 'numbered-sub-3_002d4',
+                        'normalized' => 'unnumbered-sub-2',
                         'spaces_before_argument' => ' '
                       },
-                      'node_up' => {}
+                      'structure' => {
+                        'node_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'subsection',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 3
+                              }
+                            },
+                            'normalized' => 'numbered-sub-2',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'associated_section' => {
+                                  'cmdname' => 'unnumberedsubsec',
+                                  'extra' => {
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'level' => 3
+                                  }
+                                },
+                                'normalized' => 'unnumbered-sub2-2',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'node_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'associated_section' => {
+                                      'cmdname' => 'subsection',
+                                      'extra' => {
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'level' => 3
+                                      }
+                                    },
+                                    'normalized' => 'numbered-sub2-2',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'node_prev' => {},
+                                    'node_up' => {}
+                                  }
+                                },
+                                'node_prev' => {},
+                                'node_up' => {}
+                              }
+                            },
+                            'node_prev' => {},
+                            'node_up' => {}
+                          }
+                        },
+                        'node_up' => {}
+                      }
                     },
-                    'menus' => [
-                      {
-                        'cmdname' => 'menu',
-                        'extra' => {
-                          'end_command' => {
-                            'cmdname' => 'end',
-                            'extra' => {
-                              'command_argument' => 'menu',
-                              'spaces_before_argument' => ' ',
-                              'text_arg' => 'menu'
+                    'node_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'unnumberedsec',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 2
+                          }
+                        },
+                        'normalized' => 'unnumberedsec-2_002d1',
+                        'spaces_before_argument' => ' '
+                      },
+                      'menus' => [
+                        {
+                          'cmdname' => 'menu',
+                          'extra' => {
+                            'end_command' => {
+                              'cmdname' => 'end',
+                              'extra' => {
+                                'command_argument' => 'menu',
+                                'spaces_before_argument' => ' ',
+                                'text_arg' => 'menu'
+                              }
                             }
                           }
                         }
+                      ],
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'subsection',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 3
+                              }
+                            },
+                            'normalized' => 'numbered-sub-2_002d1',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_up' => {}
+                          }
+                        },
+                        'node_prev' => {},
+                        'node_up' => {}
                       }
-                    ],
-                    'node_prev' => {},
+                    },
                     'node_up' => {}
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
-                },
-                'node_prev' => {},
-                'node_up' => {}
-              },
-              'node_prev' => {},
-              'node_up' => {}
-            },
-            'node_up' => {}
-          },
-          'menus' => [
-            {
-              'cmdname' => 'menu',
-              'extra' => {
-                'end_command' => {
-                  'cmdname' => 'end',
-                  'extra' => {
-                    'command_argument' => 'menu',
-                    'spaces_before_argument' => ' ',
-                    'text_arg' => 'menu'
                   }
-                }
-              }
-            }
-          ],
-          'node_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'associated_section' => {
-                'cmdname' => 'unnumbered',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
-                'structure' => {
-                  'level' => 1
-                }
-              },
-              'normalized' => 'unnumbered-4',
-              'spaces_before_argument' => ' '
-            },
-            'menu_child' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'associated_section' => {
-                  'cmdname' => 'unnumberedsec',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'structure' => {
-                    'level' => 2
-                  }
-                },
-                'normalized' => 'unnumberedsec-4',
-                'spaces_before_argument' => ' '
-              },
-              'menu_child' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'associated_section' => {
-                    'cmdname' => 'unnumberedsubsec',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'structure' => {
-                      'level' => 3
-                    }
-                  },
-                  'normalized' => 'unnumbered-sub-4',
-                  'spaces_before_argument' => ' '
                 },
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'associated_section' => {
-                      'cmdname' => 'subsection',
+                      'cmdname' => 'chapter',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
                       'structure' => {
-                        'level' => 3
+                        'level' => 1,
+                        'number' => 3
                       }
                     },
-                    'normalized' => 'numbered-sub-4',
+                    'normalized' => 'chapter-3',
                     'spaces_before_argument' => ' '
                   },
-                  'node_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'associated_section' => {
-                        'cmdname' => 'unnumberedsubsec',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'structure' => {
-                          'level' => 3
+                  'menus' => [
+                    {
+                      'cmdname' => 'menu',
+                      'extra' => {
+                        'end_command' => {
+                          'cmdname' => 'end',
+                          'extra' => {
+                            'command_argument' => 'menu',
+                            'spaces_before_argument' => ' ',
+                            'text_arg' => 'menu'
+                          }
                         }
+                      }
+                    }
+                  ],
+                  'structure' => {
+                    'menu_child' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'associated_section' => {
+                          'cmdname' => 'unnumberedsec',
+                          'extra' => {
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'level' => 2
+                          }
+                        },
+                        'normalized' => 'unnumberedsec-3',
+                        'spaces_before_argument' => ' '
                       },
-                      'normalized' => 'unnumbered-sub2-4',
-                      'spaces_before_argument' => ' '
+                      'menus' => [
+                        {
+                          'cmdname' => 'menu',
+                          'extra' => {
+                            'end_command' => {
+                              'cmdname' => 'end',
+                              'extra' => {
+                                'command_argument' => 'menu',
+                                'spaces_before_argument' => ' ',
+                                'text_arg' => 'menu'
+                              }
+                            }
+                          }
+                        }
+                      ],
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'unnumberedsubsec',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 3
+                              }
+                            },
+                            'normalized' => 'unnumbered-sub-3',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'associated_section' => {
+                                  'cmdname' => 'subsection',
+                                  'extra' => {
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'level' => 3
+                                  }
+                                },
+                                'normalized' => 'numbered-sub-3',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'node_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'associated_section' => {
+                                      'cmdname' => 'unnumberedsubsec',
+                                      'extra' => {
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'level' => 3
+                                      }
+                                    },
+                                    'normalized' => 'unnumbered-sub2-3',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'node_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'associated_section' => {
+                                          'cmdname' => 'subsection',
+                                          'extra' => {
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'level' => 3
+                                          }
+                                        },
+                                        'normalized' => 'numbered-sub2-3',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'node_prev' => {},
+                                        'node_up' => {}
+                                      }
+                                    },
+                                    'node_prev' => {},
+                                    'node_up' => {}
+                                  }
+                                },
+                                'node_prev' => {},
+                                'node_up' => {}
+                              }
+                            },
+                            'node_up' => {}
+                          }
+                        },
+                        'node_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'section',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 2,
+                                'number' => '3.1'
+                              }
+                            },
+                            'normalized' => 'section-3_002d1',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'node_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'associated_section' => {
+                                  'cmdname' => 'unnumberedsec',
+                                  'extra' => {
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'level' => 2
+                                  }
+                                },
+                                'normalized' => 'unnumberedsec-3_002d2',
+                                'spaces_before_argument' => ' '
+                              },
+                              'menus' => [
+                                {
+                                  'cmdname' => 'menu',
+                                  'extra' => {
+                                    'end_command' => {
+                                      'cmdname' => 'end',
+                                      'extra' => {
+                                        'command_argument' => 'menu',
+                                        'spaces_before_argument' => ' ',
+                                        'text_arg' => 'menu'
+                                      }
+                                    }
+                                  }
+                                }
+                              ],
+                              'structure' => {
+                                'menu_child' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'associated_section' => {
+                                      'cmdname' => 'subsection',
+                                      'extra' => {
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'level' => 3
+                                      }
+                                    },
+                                    'normalized' => 'numbered-sub-3_002d2',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'node_up' => {}
+                                  }
+                                },
+                                'node_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'associated_section' => {
+                                      'cmdname' => 'section',
+                                      'extra' => {
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'level' => 2,
+                                        'number' => '3.2'
+                                      }
+                                    },
+                                    'normalized' => 'section-3_002d3',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'menus' => [
+                                    {
+                                      'cmdname' => 'menu',
+                                      'extra' => {
+                                        'end_command' => {
+                                          'cmdname' => 'end',
+                                          'extra' => {
+                                            'command_argument' => 'menu',
+                                            'spaces_before_argument' => ' ',
+                                            'text_arg' => 'menu'
+                                          }
+                                        }
+                                      }
+                                    }
+                                  ],
+                                  'structure' => {
+                                    'menu_child' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'associated_section' => {
+                                          'cmdname' => 'subsection',
+                                          'extra' => {
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'level' => 3,
+                                            'number' => '3.2.1'
+                                          }
+                                        },
+                                        'normalized' => 'subsection-3_002d3',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'node_up' => {}
+                                      }
+                                    },
+                                    'node_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'associated_section' => {
+                                          'cmdname' => 'unnumberedsec',
+                                          'extra' => {
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'level' => 2
+                                          }
+                                        },
+                                        'normalized' => 
'unnumberedsec-3_002d4',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'menus' => [
+                                        {
+                                          'cmdname' => 'menu',
+                                          'extra' => {
+                                            'end_command' => {
+                                              'cmdname' => 'end',
+                                              'extra' => {
+                                                'command_argument' => 'menu',
+                                                'spaces_before_argument' => ' 
',
+                                                'text_arg' => 'menu'
+                                              }
+                                            }
+                                          }
+                                        }
+                                      ],
+                                      'structure' => {
+                                        'menu_child' => {
+                                          'cmdname' => 'node',
+                                          'extra' => {
+                                            'associated_section' => {
+                                              'cmdname' => 'subsection',
+                                              'extra' => {
+                                                'spaces_before_argument' => ' '
+                                              },
+                                              'structure' => {
+                                                'level' => 3
+                                              }
+                                            },
+                                            'normalized' => 
'numbered-sub-3_002d4',
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'node_up' => {}
+                                          }
+                                        },
+                                        'node_prev' => {},
+                                        'node_up' => {}
+                                      }
+                                    },
+                                    'node_prev' => {},
+                                    'node_up' => {}
+                                  }
+                                },
+                                'node_prev' => {},
+                                'node_up' => {}
+                              }
+                            },
+                            'node_prev' => {},
+                            'node_up' => {}
+                          }
+                        },
+                        'node_up' => {}
+                      }
                     },
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
                         'associated_section' => {
-                          'cmdname' => 'subsection',
+                          'cmdname' => 'unnumbered',
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
                           'structure' => {
-                            'level' => 3
+                            'level' => 1
                           }
                         },
-                        'normalized' => 'numbered-sub2-4',
+                        'normalized' => 'unnumbered-4',
                         'spaces_before_argument' => ' '
                       },
-                      'node_prev' => {},
-                      'node_up' => {}
-                    },
-                    'node_prev' => {},
-                    'node_up' => {}
-                  },
-                  'node_prev' => {},
-                  'node_up' => {}
-                },
-                'node_up' => {}
-              },
-              'menus' => [
-                {
-                  'cmdname' => 'menu',
-                  'extra' => {
-                    'end_command' => {
-                      'cmdname' => 'end',
-                      'extra' => {
-                        'command_argument' => 'menu',
-                        'spaces_before_argument' => ' ',
-                        'text_arg' => 'menu'
-                      }
-                    }
-                  }
-                }
-              ],
-              'node_up' => {}
-            },
-            'menus' => [
-              {
-                'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
+                      'menus' => [
+                        {
+                          'cmdname' => 'menu',
+                          'extra' => {
+                            'end_command' => {
+                              'cmdname' => 'end',
+                              'extra' => {
+                                'command_argument' => 'menu',
+                                'spaces_before_argument' => ' ',
+                                'text_arg' => 'menu'
+                              }
+                            }
+                          }
+                        }
+                      ],
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'associated_section' => {
+                              'cmdname' => 'unnumberedsec',
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'level' => 2
+                              }
+                            },
+                            'normalized' => 'unnumberedsec-4',
+                            'spaces_before_argument' => ' '
+                          },
+                          'menus' => [
+                            {
+                              'cmdname' => 'menu',
+                              'extra' => {
+                                'end_command' => {
+                                  'cmdname' => 'end',
+                                  'extra' => {
+                                    'command_argument' => 'menu',
+                                    'spaces_before_argument' => ' ',
+                                    'text_arg' => 'menu'
+                                  }
+                                }
+                              }
+                            }
+                          ],
+                          'structure' => {
+                            'menu_child' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'associated_section' => {
+                                  'cmdname' => 'unnumberedsubsec',
+                                  'extra' => {
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'level' => 3
+                                  }
+                                },
+                                'normalized' => 'unnumbered-sub-4',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'node_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'associated_section' => {
+                                      'cmdname' => 'subsection',
+                                      'extra' => {
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'level' => 3
+                                      }
+                                    },
+                                    'normalized' => 'numbered-sub-4',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'node_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'associated_section' => {
+                                          'cmdname' => 'unnumberedsubsec',
+                                          'extra' => {
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'level' => 3
+                                          }
+                                        },
+                                        'normalized' => 'unnumbered-sub2-4',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'node_next' => {
+                                          'cmdname' => 'node',
+                                          'extra' => {
+                                            'associated_section' => {
+                                              'cmdname' => 'subsection',
+                                              'extra' => {
+                                                'spaces_before_argument' => ' '
+                                              },
+                                              'structure' => {
+                                                'level' => 3
+                                              }
+                                            },
+                                            'normalized' => 'numbered-sub2-4',
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'node_prev' => {},
+                                            'node_up' => {}
+                                          }
+                                        },
+                                        'node_prev' => {},
+                                        'node_up' => {}
+                                      }
+                                    },
+                                    'node_prev' => {},
+                                    'node_up' => {}
+                                  }
+                                },
+                                'node_up' => {}
+                              }
+                            },
+                            'node_up' => {}
+                          }
+                        },
+                        'node_prev' => {},
+                        'node_up' => {}
+                      }
+                    },
+                    'node_prev' => {},
+                    'node_up' => {}
                   }
-                }
+                },
+                'node_prev' => {},
+                'node_up' => {}
               }
-            ],
+            },
             'node_prev' => {},
             'node_up' => {}
-          },
-          'node_prev' => {},
-          'node_up' => {}
+          }
         },
         'node_prev' => {},
         'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
-          }
-        }
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_child'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_prev'} = 
$result_nodes{'section_in_unnumbered_plaintext'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_up'} = 
$result_nodes{'section_in_unnumbered_plaintext'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'node_next'} = 
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_nex
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_chil
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child
 [...]
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'section_in_unnumbered_plaintext'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'section_in_unnumbered_plaintext'};
+$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'node_next'} = 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'};
 
 $result_menus{'section_in_unnumbered_plaintext'} = {
   'cmdname' => 'node',
@@ -7689,334 +7817,413 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section-in-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'chapter' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'unnumbered',
+        'normalized' => 'chapter',
         'spaces_before_argument' => ' '
       },
-      'menu_child' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'section-in-unnumbered',
-          'spaces_before_argument' => ' '
-        },
-        'menu_up' => {},
-        'menu_up_hash' => {
-          'unnumbered' => 1
-        }
-      },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'chapter-2',
-          'spaces_before_argument' => ' '
-        },
+      'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'unnumberedsec-2',
+            'normalized' => 'section-in-chapter',
             'spaces_before_argument' => ' '
           },
-          'menu_child' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumbered-sub-2',
-              'spaces_before_argument' => ' '
-            },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'numbered-sub-2',
-                'spaces_before_argument' => ' '
-              },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'unnumbered-sub2-2',
-                  'spaces_before_argument' => ' '
-                },
-                'menu_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'normalized' => 'numbered-sub2-2',
-                    'spaces_before_argument' => ' '
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'unnumberedsec-2' => 1
-                  }
-                },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'unnumberedsec-2' => 1
-                }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumberedsec-2' => 1
-              }
-            },
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'unnumberedsec-2' => 1
-            }
-          },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumberedsec-2_002d1',
-              'spaces_before_argument' => ' '
-            },
-            'menu_child' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'numbered-sub-2_002d1',
-                'spaces_before_argument' => ' '
-              },
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumberedsec-2_002d1' => 1
-              }
-            },
-            'menu_prev' => {},
+          'structure' => {
             'menu_up' => {},
             'menu_up_hash' => {
-              'chapter-2' => 1
+              'chapter' => 1
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'chapter-2' => 1
           }
         },
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'chapter-3',
+            'normalized' => 'unnumbered',
             'spaces_before_argument' => ' '
           },
-          'menu_child' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumberedsec-3',
-              'spaces_before_argument' => ' '
-            },
+          'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'unnumbered-sub-3',
+                'normalized' => 'section-in-unnumbered',
                 'spaces_before_argument' => ' '
               },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'numbered-sub-3',
-                  'spaces_before_argument' => ' '
-                },
-                'menu_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'normalized' => 'unnumbered-sub2-3',
-                    'spaces_before_argument' => ' '
-                  },
-                  'menu_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 'numbered-sub2-3',
-                      'spaces_before_argument' => ' '
-                    },
-                    'menu_prev' => {},
-                    'menu_up' => {},
-                    'menu_up_hash' => {
-                      'unnumberedsec-3' => 1
-                    }
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'unnumberedsec-3' => 1
-                  }
-                },
-                'menu_prev' => {},
+              'structure' => {
                 'menu_up' => {},
                 'menu_up_hash' => {
-                  'unnumberedsec-3' => 1
+                  'unnumbered' => 1
                 }
-              },
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumberedsec-3' => 1
               }
             },
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'section-3_002d1',
+                'normalized' => 'chapter-2',
                 'spaces_before_argument' => ' '
               },
-              'menu_next' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'unnumberedsec-3_002d2',
-                  'spaces_before_argument' => ' '
-                },
+              'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'numbered-sub-3_002d2',
-                    'spaces_before_argument' => ' '
-                  },
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'unnumberedsec-3_002d2' => 1
-                  }
-                },
-                'menu_next' => {
-                  'cmdname' => 'node',
-                  'extra' => {
-                    'normalized' => 'section-3_002d3',
+                    'normalized' => 'unnumberedsec-2',
                     'spaces_before_argument' => ' '
                   },
-                  'menu_child' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 'subsection-3_002d3',
-                      'spaces_before_argument' => ' '
-                    },
-                    'menu_up' => {},
-                    'menu_up_hash' => {
-                      'section-3_002d3' => 1
-                    }
-                  },
-                  'menu_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 'unnumberedsec-3_002d4',
-                      'spaces_before_argument' => ' '
-                    },
+                  'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'numbered-sub-3_002d4',
+                        'normalized' => 'unnumbered-sub-2',
                         'spaces_before_argument' => ' '
                       },
-                      'menu_up' => {},
-                      'menu_up_hash' => {
-                        'unnumberedsec-3_002d4' => 1
+                      'structure' => {
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'numbered-sub-2',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'normalized' => 'unnumbered-sub2-2',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'menu_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'normalized' => 'numbered-sub2-2',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'menu_prev' => {},
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'unnumberedsec-2' => 1
+                                    }
+                                  }
+                                },
+                                'menu_prev' => {},
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'unnumberedsec-2' => 1
+                                }
+                              }
+                            },
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumberedsec-2' => 1
+                            }
+                          }
+                        },
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'unnumberedsec-2' => 1
+                        }
+                      }
+                    },
+                    'menu_next' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'unnumberedsec-2_002d1',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'numbered-sub-2_002d1',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumberedsec-2_002d1' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'chapter-2' => 1
+                        }
                       }
                     },
-                    'menu_prev' => {},
                     'menu_up' => {},
                     'menu_up_hash' => {
-                      'chapter-3' => 1
+                      'chapter-2' => 1
                     }
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'chapter-3' => 1
                   }
                 },
-                'menu_prev' => {},
-                'menu_up' => {},
-                'menu_up_hash' => {
-                  'chapter-3' => 1
-                }
-              },
-              'menu_prev' => {},
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'chapter-3' => 1
-              }
-            },
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'chapter-3' => 1
-            }
-          },
-          'menu_next' => {
-            'cmdname' => 'node',
-            'extra' => {
-              'normalized' => 'unnumbered-4',
-              'spaces_before_argument' => ' '
-            },
-            'menu_child' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'unnumberedsec-4',
-                'spaces_before_argument' => ' '
-              },
-              'menu_child' => {
-                'cmdname' => 'node',
-                'extra' => {
-                  'normalized' => 'unnumbered-sub-4',
-                  'spaces_before_argument' => ' '
-                },
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'numbered-sub-4',
+                    'normalized' => 'chapter-3',
                     'spaces_before_argument' => ' '
                   },
-                  'menu_next' => {
-                    'cmdname' => 'node',
-                    'extra' => {
-                      'normalized' => 'unnumbered-sub2-4',
-                      'spaces_before_argument' => ' '
+                  'structure' => {
+                    'menu_child' => {
+                      'cmdname' => 'node',
+                      'extra' => {
+                        'normalized' => 'unnumberedsec-3',
+                        'spaces_before_argument' => ' '
+                      },
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'unnumbered-sub-3',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'normalized' => 'numbered-sub-3',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'menu_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'normalized' => 'unnumbered-sub2-3',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'menu_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'normalized' => 'numbered-sub2-3',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'menu_prev' => {},
+                                        'menu_up' => {},
+                                        'menu_up_hash' => {
+                                          'unnumberedsec-3' => 1
+                                        }
+                                      }
+                                    },
+                                    'menu_prev' => {},
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'unnumberedsec-3' => 1
+                                    }
+                                  }
+                                },
+                                'menu_prev' => {},
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'unnumberedsec-3' => 1
+                                }
+                              }
+                            },
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumberedsec-3' => 1
+                            }
+                          }
+                        },
+                        'menu_next' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'section-3_002d1',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_next' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'normalized' => 'unnumberedsec-3_002d2',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'menu_child' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'normalized' => 'numbered-sub-3_002d2',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'unnumberedsec-3_002d2' => 1
+                                    }
+                                  }
+                                },
+                                'menu_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'normalized' => 'section-3_002d3',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'menu_child' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'normalized' => 'subsection-3_002d3',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'menu_up' => {},
+                                        'menu_up_hash' => {
+                                          'section-3_002d3' => 1
+                                        }
+                                      }
+                                    },
+                                    'menu_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'normalized' => 
'unnumberedsec-3_002d4',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'menu_child' => {
+                                          'cmdname' => 'node',
+                                          'extra' => {
+                                            'normalized' => 
'numbered-sub-3_002d4',
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'menu_up' => {},
+                                            'menu_up_hash' => {
+                                              'unnumberedsec-3_002d4' => 1
+                                            }
+                                          }
+                                        },
+                                        'menu_prev' => {},
+                                        'menu_up' => {},
+                                        'menu_up_hash' => {
+                                          'chapter-3' => 1
+                                        }
+                                      }
+                                    },
+                                    'menu_prev' => {},
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'chapter-3' => 1
+                                    }
+                                  }
+                                },
+                                'menu_prev' => {},
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'chapter-3' => 1
+                                }
+                              }
+                            },
+                            'menu_prev' => {},
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'chapter-3' => 1
+                            }
+                          }
+                        },
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'chapter-3' => 1
+                        }
+                      }
                     },
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'numbered-sub2-4',
+                        'normalized' => 'unnumbered-4',
                         'spaces_before_argument' => ' '
                       },
-                      'menu_prev' => {},
-                      'menu_up' => {},
-                      'menu_up_hash' => {
-                        'unnumberedsec-4' => 1
+                      'structure' => {
+                        'menu_child' => {
+                          'cmdname' => 'node',
+                          'extra' => {
+                            'normalized' => 'unnumberedsec-4',
+                            'spaces_before_argument' => ' '
+                          },
+                          'structure' => {
+                            'menu_child' => {
+                              'cmdname' => 'node',
+                              'extra' => {
+                                'normalized' => 'unnumbered-sub-4',
+                                'spaces_before_argument' => ' '
+                              },
+                              'structure' => {
+                                'menu_next' => {
+                                  'cmdname' => 'node',
+                                  'extra' => {
+                                    'normalized' => 'numbered-sub-4',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'structure' => {
+                                    'menu_next' => {
+                                      'cmdname' => 'node',
+                                      'extra' => {
+                                        'normalized' => 'unnumbered-sub2-4',
+                                        'spaces_before_argument' => ' '
+                                      },
+                                      'structure' => {
+                                        'menu_next' => {
+                                          'cmdname' => 'node',
+                                          'extra' => {
+                                            'normalized' => 'numbered-sub2-4',
+                                            'spaces_before_argument' => ' '
+                                          },
+                                          'structure' => {
+                                            'menu_prev' => {},
+                                            'menu_up' => {},
+                                            'menu_up_hash' => {
+                                              'unnumberedsec-4' => 1
+                                            }
+                                          }
+                                        },
+                                        'menu_prev' => {},
+                                        'menu_up' => {},
+                                        'menu_up_hash' => {
+                                          'unnumberedsec-4' => 1
+                                        }
+                                      }
+                                    },
+                                    'menu_prev' => {},
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'unnumberedsec-4' => 1
+                                    }
+                                  }
+                                },
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'unnumberedsec-4' => 1
+                                }
+                              }
+                            },
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'unnumbered-4' => 1
+                            }
+                          }
+                        },
+                        'menu_prev' => {},
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
                       }
                     },
                     'menu_prev' => {},
                     'menu_up' => {},
                     'menu_up_hash' => {
-                      'unnumberedsec-4' => 1
+                      'Top' => 1
                     }
-                  },
-                  'menu_prev' => {},
-                  'menu_up' => {},
-                  'menu_up_hash' => {
-                    'unnumberedsec-4' => 1
                   }
                 },
+                'menu_prev' => {},
                 'menu_up' => {},
                 'menu_up_hash' => {
-                  'unnumberedsec-4' => 1
+                  'Top' => 1
                 }
-              },
-              'menu_up' => {},
-              'menu_up_hash' => {
-                'unnumbered-4' => 1
               }
             },
             'menu_prev' => {},
@@ -8024,80 +8231,65 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
             'menu_up_hash' => {
               'Top' => 1
             }
-          },
-          'menu_prev' => {},
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_child'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'section_in_unnumbered_plaintext'}{'menu_child'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'};
-$result_menus{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_up'} = 
$result_menus{'section_in_unnumbered_plaintext'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_nex
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_chil
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child
 [...]
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'};
+$result_menus{'section_in_unnumbered_plaintext'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'section_in_unnumbered_plaintext'};
 
 $result_errors{'section_in_unnumbered_plaintext'} = [];
 
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index 550049e790..7e9a26a218 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -58,7 +58,8 @@ $result_trees{'section_node_before_part'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -178,7 +179,8 @@ $result_sectioning{'section_node_before_part'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -219,7 +221,8 @@ $result_nodes{'section_node_before_part'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'section_node_before_part'} = {
@@ -227,7 +230,8 @@ $result_menus{'section_node_before_part'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'section_node_before_part'} = [
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index eae9d6ffea..48cf5ee755 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -51,7 +51,8 @@ $result_trees{'semi_auto'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -304,7 +305,8 @@ $result_trees{'semi_auto'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -501,7 +503,8 @@ $result_trees{'semi_auto'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -624,7 +627,8 @@ $result_trees{'semi_auto'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -805,7 +809,8 @@ $result_sectioning{'semi_auto'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -820,7 +825,8 @@ $result_sectioning{'semi_auto'} = {
                   'extra' => {
                     'normalized' => 'Chap1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -836,7 +842,8 @@ $result_sectioning{'semi_auto'} = {
                         'extra' => {
                           'normalized' => 'Sec-in-chapter',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -854,7 +861,8 @@ $result_sectioning{'semi_auto'} = {
                         'extra' => {
                           'normalized' => 'Section-non-auto',
                           'spaces_before_argument' => ' '
-                        }
+                        },
+                        'structure' => {}
                       },
                       'spaces_before_argument' => ' '
                     },
@@ -901,102 +909,110 @@ $result_nodes{'semi_auto'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
+  'menus' => [
+    {
+      'cmdname' => 'menu',
+      'extra' => {
+        'end_command' => {
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'menu',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'menu'
+          }
         }
-      },
-      'normalized' => 'Chap1',
-      'spaces_before_argument' => ' '
-    },
+      }
+    }
+  ],
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'associated_section' => {
-          'cmdname' => 'section',
+          'cmdname' => 'chapter',
           'extra' => {
             'spaces_before_argument' => ' '
           },
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'level' => 1,
+            'number' => 1
           }
         },
-        'normalized' => 'Sec-in-chapter',
+        'normalized' => 'Chap1',
         'spaces_before_argument' => ' '
       },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'section',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 2,
-              'number' => '1.2'
-            }
-          },
-          'normalized' => 'Section-non-auto',
-          'spaces_before_argument' => ' '
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
+      'menus' => [
+        {
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
             }
           }
         }
-      }
-    ],
-    'node_next' => {},
-    'node_prev' => {},
-    'node_up' => {}
-  },
-  'menus' => [
-    {
-      'cmdname' => 'menu',
-      'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
           'extra' => {
-            'command_argument' => 'menu',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'menu'
+            'associated_section' => {
+              'cmdname' => 'section',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 2,
+                'number' => '1.1'
+              }
+            },
+            'normalized' => 'Sec-in-chapter',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'section',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 2,
+                    'number' => '1.2'
+                  }
+                },
+                'normalized' => 'Section-non-auto',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_up' => {}
           }
-        }
+        },
+        'node_next' => {},
+        'node_prev' => {},
+        'node_up' => {}
       }
-    }
-  ],
-  'node_next' => {}
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'semi_auto'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'semi_auto'}{'menu_child'};
-$result_nodes{'semi_auto'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'} 
= $result_nodes{'semi_auto'};
-$result_nodes{'semi_auto'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'semi_auto'}{'menu_child'};
-$result_nodes{'semi_auto'}{'menu_child'}{'node_next'} = 
$result_nodes{'semi_auto'}{'menu_child'}{'menu_child'}{'node_next'};
-$result_nodes{'semi_auto'}{'menu_child'}{'node_prev'} = 
$result_nodes{'semi_auto'};
-$result_nodes{'semi_auto'}{'menu_child'}{'node_up'} = 
$result_nodes{'semi_auto'};
-$result_nodes{'semi_auto'}{'node_next'} = 
$result_nodes{'semi_auto'}{'menu_child'};
+$result_nodes{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'semi_auto'}{'structure'}{'menu_child'};
+$result_nodes{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'semi_auto'};
+$result_nodes{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'semi_auto'}{'structure'}{'menu_child'};
+$result_nodes{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = 
$result_nodes{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'semi_auto'};
+$result_nodes{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'node_up'} 
= $result_nodes{'semi_auto'};
+$result_nodes{'semi_auto'}{'structure'}{'node_next'} = 
$result_nodes{'semi_auto'}{'structure'}{'menu_child'};
 
 $result_menus{'semi_auto'} = {
   'cmdname' => 'node',
@@ -1004,45 +1020,53 @@ $result_menus{'semi_auto'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Chap1',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Sec-in-chapter',
-        'spaces_before_argument' => ' '
-      },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Chap1' => 1
-      }
-    },
-    'menu_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'Section-non-auto',
+        'normalized' => 'Chap1',
         'spaces_before_argument' => ' '
       },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Sec-in-chapter',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Chap1' => 1
+            }
+          }
+        },
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Section-non-auto',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'semi_auto'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'semi_auto'}{'menu_child'};
-$result_menus{'semi_auto'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'semi_auto'}{'menu_child'};
-$result_menus{'semi_auto'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'semi_auto'};
-$result_menus{'semi_auto'}{'menu_child'}{'menu_up'} = 
$result_menus{'semi_auto'};
+$result_menus{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'semi_auto'}{'structure'}{'menu_child'};
+$result_menus{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'semi_auto'}{'structure'}{'menu_child'};
+$result_menus{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'semi_auto'};
+$result_menus{'semi_auto'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} 
= $result_menus{'semi_auto'};
 
 $result_errors{'semi_auto'} = [
   {
diff --git a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl 
b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
index 3dcffd045a..c74e4c8bc3 100644
--- a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
+++ b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
@@ -51,7 +51,8 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -190,7 +191,8 @@ $result_sectioning{'setfilename_on_top_and_after_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -218,7 +220,8 @@ $result_nodes{'setfilename_on_top_and_after_node'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'setfilename_on_top_and_after_node'} = {
@@ -226,7 +229,8 @@ $result_menus{'setfilename_on_top_and_after_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'setfilename_on_top_and_after_node'} = [
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index 2835a13e19..2ca951d6e1 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -317,7 +317,8 @@ $result_trees{'space_in_node'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -365,7 +366,8 @@ $result_trees{'space_in_node'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -413,7 +415,8 @@ $result_trees{'space_in_node'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -454,7 +457,8 @@ $result_trees{'space_in_node'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -562,33 +566,6 @@ $result_nodes{'space_in_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Chap-first-here',
-      'spaces_before_argument' => '  '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'Test-title',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'Last-with-spaces',
-          'spaces_before_argument' => '   '
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -604,15 +581,50 @@ $result_nodes{'space_in_node'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'Chap-first-here',
+        'spaces_before_argument' => '  '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Test-title',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'Last-with-spaces',
+                'spaces_before_argument' => '   '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'space_in_node'}{'menu_child'}{'node_next'};
-$result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'space_in_node'};
-$result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_prev'} = 
$result_nodes{'space_in_node'}{'menu_child'};
-$result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'space_in_node'};
-$result_nodes{'space_in_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'space_in_node'};
-$result_nodes{'space_in_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'space_in_node'};
-$result_nodes{'space_in_node'}{'node_next'} = 
$result_nodes{'space_in_node'}{'menu_child'};
+$result_nodes{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'space_in_node'};
+$result_nodes{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'space_in_node'}{'structure'}{'menu_child'};
+$result_nodes{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'space_in_node'};
+$result_nodes{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'space_in_node'};
+$result_nodes{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'space_in_node'};
+$result_nodes{'space_in_node'}{'structure'}{'node_next'} = 
$result_nodes{'space_in_node'}{'structure'}{'menu_child'};
 
 $result_menus{'space_in_node'} = {
   'cmdname' => 'node',
@@ -620,47 +632,55 @@ $result_menus{'space_in_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Chap-first-here',
-      'spaces_before_argument' => '  '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Test-title',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chap-first-here',
+        'spaces_before_argument' => '  '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'Last-with-spaces',
-          'spaces_before_argument' => '   '
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Test-title',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'Last-with-spaces',
+                'spaces_before_argument' => '   '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'space_in_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'space_in_node'}{'menu_child'}{'menu_next'};
-$result_menus{'space_in_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'space_in_node'};
-$result_menus{'space_in_node'}{'menu_child'}{'menu_next'}{'menu_prev'} = 
$result_menus{'space_in_node'}{'menu_child'};
-$result_menus{'space_in_node'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'space_in_node'};
-$result_menus{'space_in_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'space_in_node'};
+$result_menus{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'space_in_node'};
+$result_menus{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'space_in_node'}{'structure'}{'menu_child'};
+$result_menus{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'space_in_node'};
+$result_menus{'space_in_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'space_in_node'};
 
 $result_errors{'space_in_node'} = [];
 
diff --git a/tp/t/results/sectioning/top_no_argument_and_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_node.pl
index 17f1c28311..b7d5278bf6 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -51,7 +51,8 @@ $result_trees{'top_no_argument_and_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -109,7 +110,8 @@ $result_sectioning{'top_no_argument_and_node'} = {
             'extra' => {
               'normalized' => 'start',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -134,7 +136,8 @@ $result_nodes{'top_no_argument_and_node'} = {
     },
     'normalized' => 'start',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'top_no_argument_and_node'} = {
@@ -142,7 +145,8 @@ $result_menus{'top_no_argument_and_node'} = {
   'extra' => {
     'normalized' => 'start',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'top_no_argument_and_node'} = [];
diff --git a/tp/t/results/sectioning/top_no_argument_and_top_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
index f15f07e704..18dc333784 100644
--- a/tp/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -51,7 +51,8 @@ $result_trees{'top_no_argument_and_top_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -109,7 +110,8 @@ $result_sectioning{'top_no_argument_and_top_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           }
         },
         'structure' => {
@@ -134,7 +136,8 @@ $result_nodes{'top_no_argument_and_top_node'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'top_no_argument_and_top_node'} = {
@@ -142,7 +145,8 @@ $result_menus{'top_no_argument_and_top_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'top_no_argument_and_top_node'} = [];
diff --git a/tp/t/results/sectioning/top_node_no_menu_direction.pl 
b/tp/t/results/sectioning/top_node_no_menu_direction.pl
index 5a27922cc0..8d0b0bfb40 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -231,7 +231,8 @@ $result_trees{'top_node_no_menu_direction'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -310,7 +311,8 @@ $result_trees{'top_node_no_menu_direction'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -386,15 +388,6 @@ $result_nodes{'top_node_no_menu_direction'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -410,11 +403,24 @@ $result_nodes{'top_node_no_menu_direction'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'top_node_no_menu_direction'}{'menu_child'}{'node_prev'} = 
$result_nodes{'top_node_no_menu_direction'};
-$result_nodes{'top_node_no_menu_direction'}{'menu_child'}{'node_up'} = 
$result_nodes{'top_node_no_menu_direction'};
-$result_nodes{'top_node_no_menu_direction'}{'node_next'} = 
$result_nodes{'top_node_no_menu_direction'}{'menu_child'};
+$result_nodes{'top_node_no_menu_direction'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'top_node_no_menu_direction'};
+$result_nodes{'top_node_no_menu_direction'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'top_node_no_menu_direction'};
+$result_nodes{'top_node_no_menu_direction'}{'structure'}{'node_next'} = 
$result_nodes{'top_node_no_menu_direction'}{'structure'}{'menu_child'};
 
 $result_menus{'top_node_no_menu_direction'} = {
   'cmdname' => 'node',
@@ -422,28 +428,32 @@ $result_menus{'top_node_no_menu_direction'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'second-node',
-      'spaces_before_argument' => ' '
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'second-node',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_next' => {},
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     },
-    'menu_next' => {},
+    'menu_prev' => {},
     'menu_up' => {},
     'menu_up_hash' => {
       'Top' => 1
     }
-  },
-  'menu_prev' => {},
-  'menu_up' => {},
-  'menu_up_hash' => {
-    'Top' => 1
   }
 };
-$result_menus{'top_node_no_menu_direction'}{'menu_child'}{'menu_next'} = 
$result_menus{'top_node_no_menu_direction'};
-$result_menus{'top_node_no_menu_direction'}{'menu_child'}{'menu_up'} = 
$result_menus{'top_node_no_menu_direction'};
-$result_menus{'top_node_no_menu_direction'}{'menu_prev'} = 
$result_menus{'top_node_no_menu_direction'}{'menu_child'};
-$result_menus{'top_node_no_menu_direction'}{'menu_up'} = 
$result_menus{'top_node_no_menu_direction'};
+$result_menus{'top_node_no_menu_direction'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}
 = $result_menus{'top_node_no_menu_direction'};
+$result_menus{'top_node_no_menu_direction'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'top_node_no_menu_direction'};
+$result_menus{'top_node_no_menu_direction'}{'structure'}{'menu_prev'} = 
$result_menus{'top_node_no_menu_direction'}{'structure'}{'menu_child'};
+$result_menus{'top_node_no_menu_direction'}{'structure'}{'menu_up'} = 
$result_menus{'top_node_no_menu_direction'};
 
 $result_errors{'top_node_no_menu_direction'} = [
   {
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index 4bc01bd644..d6787b0267 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -59,7 +59,8 @@ $result_trees{'top_node_part_top'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -193,7 +194,8 @@ $result_sectioning{'top_node_part_top'} = {
                 'extra' => {
                   'normalized' => 'Top',
                   'spaces_before_argument' => ' '
-                }
+                },
+                'structure' => {}
               },
               'associated_part' => {},
               'spaces_before_argument' => ' '
@@ -244,7 +246,8 @@ $result_nodes{'top_node_part_top'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'top_node_part_top'} = {
@@ -252,7 +255,8 @@ $result_menus{'top_node_part_top'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'top_node_part_top'} = [
@@ -288,7 +292,8 @@ $result_elements{'top_node_part_top'} = [
         'extra' => {
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
-        }
+        },
+        'structure' => {}
       },
       'section' => {
         'cmdname' => 'top',
diff --git a/tp/t/results/sectioning/top_node_up_url.pl 
b/tp/t/results/sectioning/top_node_up_url.pl
index 8e546d4ad7..d2fc30c915 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -52,7 +52,8 @@ $result_trees{'top_node_up_url'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -259,7 +260,8 @@ $result_trees{'top_node_up_url'} = [
           'line_nr' => 8,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -342,7 +344,8 @@ $result_sectioning{'top_node_up_url'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -371,15 +374,6 @@ $result_nodes{'top_node_up_url'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -395,11 +389,24 @@ $result_nodes{'top_node_up_url'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'top_node_up_url'}{'menu_child'}{'node_prev'} = 
$result_nodes{'top_node_up_url'};
-$result_nodes{'top_node_up_url'}{'menu_child'}{'node_up'} = 
$result_nodes{'top_node_up_url'};
-$result_nodes{'top_node_up_url'}{'node_next'} = 
$result_nodes{'top_node_up_url'}{'menu_child'};
+$result_nodes{'top_node_up_url'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'top_node_up_url'};
+$result_nodes{'top_node_up_url'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'top_node_up_url'};
+$result_nodes{'top_node_up_url'}{'structure'}{'node_next'} = 
$result_nodes{'top_node_up_url'}{'structure'}{'menu_child'};
 
 $result_menus{'top_node_up_url'} = {
   'cmdname' => 'node',
@@ -407,19 +414,23 @@ $result_menus{'top_node_up_url'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'first',
-      'spaces_before_argument' => ' '
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => 'first',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
+      }
     }
   }
 };
-$result_menus{'top_node_up_url'}{'menu_child'}{'menu_up'} = 
$result_menus{'top_node_up_url'};
+$result_menus{'top_node_up_url'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'top_node_up_url'};
 
 $result_errors{'top_node_up_url'} = [];
 
@@ -436,15 +447,19 @@ $result_elements{'top_node_up_url'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'first',
-            'spaces_before_argument' => ' '
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
+        'structure' => {
+          'menu_child' => {
+            'cmdname' => 'node',
+            'extra' => {
+              'normalized' => 'first',
+              'spaces_before_argument' => ' '
+            },
+            'structure' => {
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
+            }
           }
         }
       },
@@ -487,10 +502,10 @@ $result_elements{'top_node_up_url'} = [
   },
   {}
 ];
-$result_elements{'top_node_up_url'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'top_node_up_url'}[0]{'extra'}{'node'};
+$result_elements{'top_node_up_url'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'top_node_up_url'}[0]{'extra'}{'node'};
 $result_elements{'top_node_up_url'}[0]{'extra'}{'unit_command'} = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'node'};
-$result_elements{'top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = $result_elements{'top_node_up_url'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = $result_elements{'top_node_up_url'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'top_node_up_url'}[0];
 
$result_elements{'top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'top_node_up_url'}[0];
 
$result_elements{'top_node_up_url'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = $result_elements{'top_node_up_url'}[0];
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index 34daf12f41..d7e3e7dad7 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -137,7 +137,8 @@ $result_trees{'top_without_node_nodes'} = [
           'line_nr' => 4,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -269,7 +270,8 @@ $result_sectioning{'top_without_node_nodes'} = {
                   'extra' => {
                     'normalized' => 'second',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -309,13 +311,16 @@ $result_nodes{'top_without_node_nodes'} = {
     'normalized' => 'second',
     'spaces_before_argument' => ' '
   },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
+  'structure' => {
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      },
+      'structure' => {}
     }
   }
 };
@@ -325,7 +330,8 @@ $result_menus{'top_without_node_nodes'} = {
   'extra' => {
     'normalized' => 'second',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'top_without_node_nodes'} = [];
@@ -342,7 +348,8 @@ $result_elements{'top_without_node_nodes'} = [
         'extra' => {
           'normalized' => 'second',
           'spaces_before_argument' => ' '
-        }
+        },
+        'structure' => {}
       },
       'section' => {
         'cmdname' => 'chapter',
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index 9bfa41c888..a1f18430e7 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -147,7 +147,8 @@ $result_trees{'top_without_node_sections'} = [
           'line_nr' => 4,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -284,7 +285,8 @@ $result_sectioning{'top_without_node_sections'} = {
                   'extra' => {
                     'normalized' => 'second',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -324,13 +326,16 @@ $result_nodes{'top_without_node_sections'} = {
     'normalized' => 'second',
     'spaces_before_argument' => ' '
   },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
+  'structure' => {
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      },
+      'structure' => {}
     }
   }
 };
@@ -340,7 +345,8 @@ $result_menus{'top_without_node_sections'} = {
   'extra' => {
     'normalized' => 'second',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'top_without_node_sections'} = [];
@@ -372,7 +378,8 @@ $result_elements{'top_without_node_sections'} = [
               'extra' => {
                 'normalized' => 'second',
                 'spaces_before_argument' => ' '
-              }
+              },
+              'structure' => {}
             },
             'section' => {
               'cmdname' => 'chapter',
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 30da2cefa4..b3015b665b 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -325,7 +325,8 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -401,7 +402,8 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
           'line_nr' => 9,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -461,7 +463,8 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -532,7 +535,8 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -658,33 +662,6 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_00e3',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'n',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_00e2',
-          'spaces_before_argument' => ' '
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -700,15 +677,50 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'normalized' => '_00e3',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'n',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => '_00e2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = 
$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_next'};
-$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'transliterated_split_equivalent_nodes'};
-$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_next'}{'node_prev'}
 = $result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'};
-$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_next'}{'node_up'}
 = $result_nodes{'transliterated_split_equivalent_nodes'};
-$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_prev'}
 = $result_nodes{'transliterated_split_equivalent_nodes'};
-$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_up'}
 = $result_nodes{'transliterated_split_equivalent_nodes'};
-$result_nodes{'transliterated_split_equivalent_nodes'}{'node_next'} = 
$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'};
+$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'transliterated_split_equivalent_nodes'};
+$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'transliterated_split_equivalent_nodes'};
+$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'transliterated_split_equivalent_nodes'};
+$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'transliterated_split_equivalent_nodes'};
+$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'node_next'}
 = 
$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'};
 
 $result_menus{'transliterated_split_equivalent_nodes'} = {
   'cmdname' => 'node',
@@ -716,47 +728,55 @@ $result_menus{'transliterated_split_equivalent_nodes'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => '_00e3',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'n',
+        'normalized' => '_00e3',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => '_00e2',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'n',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => '_00e2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'transliterated_split_equivalent_nodes'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'transliterated_split_equivalent_nodes'}{'menu_child'}{'menu_next'};
-$result_menus{'transliterated_split_equivalent_nodes'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'transliterated_split_equivalent_nodes'};
-$result_menus{'transliterated_split_equivalent_nodes'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'transliterated_split_equivalent_nodes'}{'menu_child'};
-$result_menus{'transliterated_split_equivalent_nodes'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'transliterated_split_equivalent_nodes'};
-$result_menus{'transliterated_split_equivalent_nodes'}{'menu_child'}{'menu_up'}
 = $result_menus{'transliterated_split_equivalent_nodes'};
+$result_menus{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'transliterated_split_equivalent_nodes'};
+$result_menus{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'};
+$result_menus{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'transliterated_split_equivalent_nodes'};
+$result_menus{'transliterated_split_equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'transliterated_split_equivalent_nodes'};
 
 $result_errors{'transliterated_split_equivalent_nodes'} = [];
 
@@ -773,39 +793,47 @@ $result_elements{'transliterated_split_equivalent_nodes'} 
= [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => '_00e3',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'n',
+              'normalized' => '_00e3',
               'spaces_before_argument' => ' '
             },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => '_00e2',
-                'spaces_before_argument' => ' '
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'n',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_next' => {
+                    'cmdname' => 'node',
+                    'extra' => {
+                      'normalized' => '_00e2',
+                      'spaces_before_argument' => ' '
+                    },
+                    'structure' => {
+                      'menu_prev' => {},
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'Top' => 1
+                      }
+                    }
+                  },
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
               },
-              'menu_prev' => {},
               'menu_up' => {},
               'menu_up_hash' => {
                 'Top' => 1
               }
-            },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -876,20 +904,20 @@ $result_elements{'transliterated_split_equivalent_nodes'} 
= [
   {},
   {}
 ];
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'transliterated_split_equivalent_nodes'}[0];
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodeBack'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'NodePrev'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'structure'}{'directions'}{'Forward'}{'structure'}{'directions'}{'Forward'};
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end.pl
index beef0ecba1..81247b3be6 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -52,7 +52,8 @@ $result_trees{'two_nodes_at_the_end'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -428,7 +429,8 @@ $result_trees{'two_nodes_at_the_end'} = [
           'line_nr' => 10,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -533,7 +535,8 @@ $result_trees{'two_nodes_at_the_end'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -574,7 +577,8 @@ $result_trees{'two_nodes_at_the_end'} = [
           'line_nr' => 17,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -723,7 +727,8 @@ $result_sectioning{'two_nodes_at_the_end'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -738,7 +743,8 @@ $result_sectioning{'two_nodes_at_the_end'} = {
                   'extra' => {
                     'normalized' => 'chapter-1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -777,43 +783,6 @@ $result_nodes{'two_nodes_at_the_end'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter-1',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'node-after-chapter-1',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'node-after-chapter-2',
-          'spaces_before_argument' => ' '
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -829,15 +798,60 @@ $result_nodes{'two_nodes_at_the_end'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter-1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node-after-chapter-1',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'node-after-chapter-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
 = $result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_next'};
-$result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
 = $result_nodes{'two_nodes_at_the_end'};
-$result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_next'}{'node_prev'} 
= $result_nodes{'two_nodes_at_the_end'}{'menu_child'};
-$result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_next'}{'node_up'} = 
$result_nodes{'two_nodes_at_the_end'};
-$result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_prev'} = 
$result_nodes{'two_nodes_at_the_end'};
-$result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_up'} = 
$result_nodes{'two_nodes_at_the_end'};
-$result_nodes{'two_nodes_at_the_end'}{'node_next'} = 
$result_nodes{'two_nodes_at_the_end'}{'menu_child'};
+$result_nodes{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = 
$result_nodes{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'two_nodes_at_the_end'};
+$result_nodes{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'two_nodes_at_the_end'}{'structure'}{'menu_child'};
+$result_nodes{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'two_nodes_at_the_end'};
+$result_nodes{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'two_nodes_at_the_end'};
+$result_nodes{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'two_nodes_at_the_end'};
+$result_nodes{'two_nodes_at_the_end'}{'structure'}{'node_next'} = 
$result_nodes{'two_nodes_at_the_end'}{'structure'}{'menu_child'};
 
 $result_menus{'two_nodes_at_the_end'} = {
   'cmdname' => 'node',
@@ -845,47 +859,55 @@ $result_menus{'two_nodes_at_the_end'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node-after-chapter-1',
+        'normalized' => 'chapter-1',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'node-after-chapter-2',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node-after-chapter-1',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'node-after-chapter-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'two_nodes_at_the_end'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'two_nodes_at_the_end'}{'menu_child'}{'menu_next'};
-$result_menus{'two_nodes_at_the_end'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'two_nodes_at_the_end'};
-$result_menus{'two_nodes_at_the_end'}{'menu_child'}{'menu_next'}{'menu_prev'} 
= $result_menus{'two_nodes_at_the_end'}{'menu_child'};
-$result_menus{'two_nodes_at_the_end'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'two_nodes_at_the_end'};
-$result_menus{'two_nodes_at_the_end'}{'menu_child'}{'menu_up'} = 
$result_menus{'two_nodes_at_the_end'};
+$result_menus{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'two_nodes_at_the_end'};
+$result_menus{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'two_nodes_at_the_end'}{'structure'}{'menu_child'};
+$result_menus{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'two_nodes_at_the_end'};
+$result_menus{'two_nodes_at_the_end'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'two_nodes_at_the_end'};
 
 $result_errors{'two_nodes_at_the_end'} = [];
 
@@ -902,39 +924,47 @@ $result_elements{'two_nodes_at_the_end'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'chapter-1',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'node-after-chapter-1',
+              'normalized' => 'chapter-1',
               'spaces_before_argument' => ' '
             },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'node-after-chapter-2',
-                'spaces_before_argument' => ' '
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'node-after-chapter-1',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_next' => {
+                    'cmdname' => 'node',
+                    'extra' => {
+                      'normalized' => 'node-after-chapter-2',
+                      'spaces_before_argument' => ' '
+                    },
+                    'structure' => {
+                      'menu_prev' => {},
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'Top' => 1
+                      }
+                    }
+                  },
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
               },
-              'menu_prev' => {},
               'menu_up' => {},
               'menu_up_hash' => {
                 'Top' => 1
               }
-            },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -991,13 +1021,13 @@ $result_elements{'two_nodes_at_the_end'} = [
   },
   {}
 ];
-$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'};
-$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'};
-$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'};
+$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'};
+$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'};
+$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'};
 $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'unit_command'} = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'section'};
-$result_elements{'two_nodes_at_the_end'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'two_nodes_at_the_end'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'two_nodes_at_the_end'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'two_nodes_at_the_end'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'two_nodes_at_the_end'}[0];
 
$result_elements{'two_nodes_at_the_end'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'two_nodes_at_the_end'}[0];
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 9fae6525e4..f8d825ba78 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -52,7 +52,8 @@ $result_trees{'two_nodes_between_chapters'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -428,7 +429,8 @@ $result_trees{'two_nodes_between_chapters'} = [
           'line_nr' => 10,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -516,7 +518,8 @@ $result_trees{'two_nodes_between_chapters'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -570,7 +573,8 @@ $result_trees{'two_nodes_between_chapters'} = [
           'line_nr' => 15,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -755,7 +759,8 @@ $result_sectioning{'two_nodes_between_chapters'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -770,7 +775,8 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -790,7 +796,8 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                   'extra' => {
                     'normalized' => 'chapter-2',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -834,53 +841,6 @@ $result_nodes{'two_nodes_between_chapters'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'chapter-1',
-      'spaces_before_argument' => ' '
-    },
-    'node_next' => {},
-    'node_prev' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'node-between-chapters',
-        'spaces_before_argument' => ' '
-      },
-      'node_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'associated_section' => {
-            'cmdname' => 'chapter',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'structure' => {
-              'level' => 1,
-              'number' => 2
-            }
-          },
-          'normalized' => 'chapter-2',
-          'spaces_before_argument' => ' '
-        },
-        'node_prev' => {},
-        'node_up' => {}
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -896,15 +856,70 @@ $result_nodes{'two_nodes_between_chapters'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'chapter-1',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_next' => {},
+        'node_prev' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node-between-chapters',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'associated_section' => {
+                  'cmdname' => 'chapter',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'structure' => {
+                    'level' => 1,
+                    'number' => 2
+                  }
+                },
+                'normalized' => 'chapter-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'node_prev' => {},
+                'node_up' => {}
+              }
+            },
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_next'} = 
$result_nodes{'two_nodes_between_chapters'};
-$result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_prev'}{'node_next'}{'node_prev'}
 = $result_nodes{'two_nodes_between_chapters'}{'menu_child'};
-$result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_prev'}{'node_next'}{'node_up'}
 = $result_nodes{'two_nodes_between_chapters'};
-$result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_prev'}{'node_prev'}
 = $result_nodes{'two_nodes_between_chapters'}{'menu_child'};
-$result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_prev'}{'node_up'}
 = $result_nodes{'two_nodes_between_chapters'};
-$result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_up'} = 
$result_nodes{'two_nodes_between_chapters'};
-$result_nodes{'two_nodes_between_chapters'}{'node_next'} = 
$result_nodes{'two_nodes_between_chapters'}{'menu_child'};
+$result_nodes{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_next'}
 = $result_nodes{'two_nodes_between_chapters'};
+$result_nodes{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'two_nodes_between_chapters'}{'structure'}{'menu_child'};
+$result_nodes{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'two_nodes_between_chapters'};
+$result_nodes{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}{'structure'}{'node_prev'}
 = $result_nodes{'two_nodes_between_chapters'}{'structure'}{'menu_child'};
+$result_nodes{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}{'structure'}{'node_up'}
 = $result_nodes{'two_nodes_between_chapters'};
+$result_nodes{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'two_nodes_between_chapters'};
+$result_nodes{'two_nodes_between_chapters'}{'structure'}{'node_next'} = 
$result_nodes{'two_nodes_between_chapters'}{'structure'}{'menu_child'};
 
 $result_menus{'two_nodes_between_chapters'} = {
   'cmdname' => 'node',
@@ -912,47 +927,55 @@ $result_menus{'two_nodes_between_chapters'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'chapter-1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node-between-chapters',
+        'normalized' => 'chapter-1',
         'spaces_before_argument' => ' '
       },
-      'menu_next' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'chapter-2',
-          'spaces_before_argument' => ' '
+      'structure' => {
+        'menu_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'node-between-chapters',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_next' => {
+              'cmdname' => 'node',
+              'extra' => {
+                'normalized' => 'chapter-2',
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'menu_prev' => {},
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
+              }
+            },
+            'menu_prev' => {},
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
+          }
         },
-        'menu_prev' => {},
         'menu_up' => {},
         'menu_up_hash' => {
           'Top' => 1
         }
-      },
-      'menu_prev' => {},
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Top' => 1
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'two_nodes_between_chapters'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_menus{'two_nodes_between_chapters'}{'menu_child'}{'menu_next'};
-$result_menus{'two_nodes_between_chapters'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_menus{'two_nodes_between_chapters'};
-$result_menus{'two_nodes_between_chapters'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_menus{'two_nodes_between_chapters'}{'menu_child'};
-$result_menus{'two_nodes_between_chapters'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'two_nodes_between_chapters'};
-$result_menus{'two_nodes_between_chapters'}{'menu_child'}{'menu_up'} = 
$result_menus{'two_nodes_between_chapters'};
+$result_menus{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_menus{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'two_nodes_between_chapters'};
+$result_menus{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = $result_menus{'two_nodes_between_chapters'}{'structure'}{'menu_child'};
+$result_menus{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_menus{'two_nodes_between_chapters'};
+$result_menus{'two_nodes_between_chapters'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'two_nodes_between_chapters'};
 
 $result_errors{'two_nodes_between_chapters'} = [
   {
@@ -988,39 +1011,47 @@ $result_elements{'two_nodes_between_chapters'} = [
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         },
-        'menu_child' => {
-          'cmdname' => 'node',
-          'extra' => {
-            'normalized' => 'chapter-1',
-            'spaces_before_argument' => ' '
-          },
-          'menu_next' => {
+        'structure' => {
+          'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'node-between-chapters',
+              'normalized' => 'chapter-1',
               'spaces_before_argument' => ' '
             },
-            'menu_next' => {
-              'cmdname' => 'node',
-              'extra' => {
-                'normalized' => 'chapter-2',
-                'spaces_before_argument' => ' '
+            'structure' => {
+              'menu_next' => {
+                'cmdname' => 'node',
+                'extra' => {
+                  'normalized' => 'node-between-chapters',
+                  'spaces_before_argument' => ' '
+                },
+                'structure' => {
+                  'menu_next' => {
+                    'cmdname' => 'node',
+                    'extra' => {
+                      'normalized' => 'chapter-2',
+                      'spaces_before_argument' => ' '
+                    },
+                    'structure' => {
+                      'menu_prev' => {},
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'Top' => 1
+                      }
+                    }
+                  },
+                  'menu_prev' => {},
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
+                }
               },
-              'menu_prev' => {},
               'menu_up' => {},
               'menu_up_hash' => {
                 'Top' => 1
               }
-            },
-            'menu_prev' => {},
-            'menu_up' => {},
-            'menu_up_hash' => {
-              'Top' => 1
             }
-          },
-          'menu_up' => {},
-          'menu_up_hash' => {
-            'Top' => 1
           }
         }
       },
@@ -1109,17 +1140,17 @@ $result_elements{'two_nodes_between_chapters'} = [
   {},
   {}
 ];
-$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'};
-$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'};
-$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'menu_child'};
-$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'};
-$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'};
+$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'};
+$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
+$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
 = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'};
+$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'};
 $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'unit_command'} = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'section'};
-$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'menu_child'};
+$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'structure'}{'menu_child'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = $result_elements{'two_nodes_between_chapters'}[0];
 
$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = $result_elements{'two_nodes_between_chapters'}[0];
-$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'};
+$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'Back'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastForward'}{'structure'}{'directions'}{'FastBack'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'structure'}{'directions'}{'FastForward'};
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl 
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index e2ae95ac84..24674245d5 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -168,7 +168,8 @@ $result_trees{'unknown_node_in_menu'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -230,7 +231,8 @@ $result_nodes{'unknown_node_in_menu'} = {
         }
       }
     }
-  ]
+  ],
+  'structure' => {}
 };
 
 $result_menus{'unknown_node_in_menu'} = {
@@ -238,7 +240,8 @@ $result_menus{'unknown_node_in_menu'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'unknown_node_in_menu'} = [
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index 0531536a34..8de62e928c 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -118,7 +118,8 @@ $result_trees{'unnumbered_before_node_top_top'} = [
           'line_nr' => 5,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -243,7 +244,8 @@ $result_sectioning{'unnumbered_before_node_top_top'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -276,7 +278,8 @@ $result_nodes{'unnumbered_before_node_top_top'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'unnumbered_before_node_top_top'} = {
@@ -284,7 +287,8 @@ $result_menus{'unnumbered_before_node_top_top'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'unnumbered_before_node_top_top'} = [
@@ -326,7 +330,8 @@ $result_elements{'unnumbered_before_node_top_top'} = [
               'extra' => {
                 'normalized' => 'Top',
                 'spaces_before_argument' => ' '
-              }
+              },
+              'structure' => {}
             },
             'section' => {
               'cmdname' => 'top',
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index e568e5eaa7..e2c5baaee4 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -136,7 +136,8 @@ $result_trees{'unnumbered_before_top_node'} = [
           'line_nr' => 3,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       }
     ],
     'extra' => {
@@ -208,7 +209,8 @@ $result_nodes{'unnumbered_before_top_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'unnumbered_before_top_node'} = {
@@ -216,7 +218,8 @@ $result_menus{'unnumbered_before_top_node'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'unnumbered_before_top_node'} = [];
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index 10dc6df1b1..3d941d1249 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -87,7 +87,8 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -280,7 +281,8 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
           'line_nr' => 9,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -439,7 +441,8 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
             'extra' => {
               'normalized' => 'a-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -468,7 +471,8 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
             'extra' => {
               'normalized' => 'second',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -508,13 +512,16 @@ $result_nodes{'unnumbered_top_without_node_nodes'} = {
     'normalized' => 'a-node',
     'spaces_before_argument' => ' '
   },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
+  'structure' => {
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      },
+      'structure' => {}
     }
   }
 };
@@ -524,7 +531,8 @@ $result_menus{'unnumbered_top_without_node_nodes'} = {
   'extra' => {
     'normalized' => 'a-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'unnumbered_top_without_node_nodes'} = [
@@ -560,7 +568,8 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
         'extra' => {
           'normalized' => 'a-node',
           'spaces_before_argument' => ' '
-        }
+        },
+        'structure' => {}
       },
       'section' => {
         'cmdname' => 'unnumbered',
@@ -584,7 +593,8 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
               'extra' => {
                 'normalized' => 'second',
                 'spaces_before_argument' => ' '
-              }
+              },
+              'structure' => {}
             },
             'section' => {
               'cmdname' => 'chapter',
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index bc1cc051fb..de52eaecc4 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -87,7 +87,8 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -292,7 +293,8 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
           'line_nr' => 9,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -454,7 +456,8 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
             'extra' => {
               'normalized' => 'a-node',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -483,7 +486,8 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
             'extra' => {
               'normalized' => 'second',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -523,13 +527,16 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
     'normalized' => 'a-node',
     'spaces_before_argument' => ' '
   },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
+  'structure' => {
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      },
+      'structure' => {}
     }
   }
 };
@@ -539,7 +546,8 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
   'extra' => {
     'normalized' => 'a-node',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'unnumbered_top_without_node_sections'} = [
@@ -575,7 +583,8 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
         'extra' => {
           'normalized' => 'a-node',
           'spaces_before_argument' => ' '
-        }
+        },
+        'structure' => {}
       },
       'section' => {
         'cmdname' => 'unnumbered',
@@ -614,7 +623,8 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
                     'extra' => {
                       'normalized' => 'second',
                       'spaces_before_argument' => ' '
-                    }
+                    },
+                    'structure' => {}
                   },
                   'section' => {
                     'cmdname' => 'chapter',
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index 6356a4312f..98fd922a42 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -782,7 +782,8 @@ $result_trees{'value_in_index_commands'} = {
         'line_nr' => 22,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -957,7 +958,8 @@ $result_nodes{'value_in_index_commands'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'value_in_index_commands'} = {
@@ -966,7 +968,8 @@ $result_menus{'value_in_index_commands'} = {
     'isindex' => 1,
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'value_in_index_commands'} = [
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 00001b018c..99ae2394d8 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -82,7 +82,8 @@ $result_trees{'value_in_misc_commands'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3352,7 +3353,8 @@ $result_sectioning{'value_in_misc_commands'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3380,7 +3382,8 @@ $result_nodes{'value_in_misc_commands'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'value_in_misc_commands'} = {
@@ -3388,7 +3391,8 @@ $result_menus{'value_in_misc_commands'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'value_in_misc_commands'} = [
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index 1bce7fb6d3..f0ad8f4c3e 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -158,7 +158,8 @@ $result_trees{'value_in_node'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -402,7 +403,8 @@ $result_trees{'value_in_node'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -723,7 +725,8 @@ $result_trees{'value_in_node'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -888,7 +891,8 @@ $result_sectioning{'value_in_node'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -903,7 +907,8 @@ $result_sectioning{'value_in_node'} = {
                   'extra' => {
                     'normalized' => 'Node-1',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -942,49 +947,6 @@ $result_nodes{'value_in_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'Node-1',
-      'spaces_before_argument' => ' '
-    },
-    'menu_child' => {
-      'cmdname' => 'node',
-      'extra' => {
-        'normalized' => 'Section-1_002e1',
-        'spaces_before_argument' => ' '
-      },
-      'node_prev' => {},
-      'node_up' => {}
-    },
-    'menus' => [
-      {
-        'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
-      }
-    ],
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -1000,38 +962,87 @@ $result_nodes{'value_in_node'} = {
       }
     }
   ],
-  'node_next' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
-    }
-  },
-  'node_prev' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
-    }
-  },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'Node-1',
+        'spaces_before_argument' => ' '
+      },
+      'menus' => [
         {
-          'text' => 'dir'
+          'cmdname' => 'menu',
+          'extra' => {
+            'end_command' => {
+              'cmdname' => 'end',
+              'extra' => {
+                'command_argument' => 'menu',
+                'spaces_before_argument' => ' ',
+                'text_arg' => 'menu'
+              }
+            }
+          }
         }
-      ]
+      ],
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Section-1_002e1',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {}
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
+    },
+    'node_prev' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
+    },
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
     }
   }
 };
-$result_nodes{'value_in_node'}{'menu_child'}{'menu_child'}{'node_prev'} = 
$result_nodes{'value_in_node'}{'menu_child'};
-$result_nodes{'value_in_node'}{'menu_child'}{'menu_child'}{'node_up'} = 
$result_nodes{'value_in_node'}{'menu_child'};
-$result_nodes{'value_in_node'}{'menu_child'}{'node_prev'} = 
$result_nodes{'value_in_node'};
-$result_nodes{'value_in_node'}{'menu_child'}{'node_up'} = 
$result_nodes{'value_in_node'};
+$result_nodes{'value_in_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'value_in_node'}{'structure'}{'menu_child'};
+$result_nodes{'value_in_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'value_in_node'}{'structure'}{'menu_child'};
+$result_nodes{'value_in_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'value_in_node'};
+$result_nodes{'value_in_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'value_in_node'};
 
 $result_menus{'value_in_node'} = {
   'cmdname' => 'node',
@@ -1039,31 +1050,37 @@ $result_menus{'value_in_node'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'Node-1',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Section-1_002e1',
+        'normalized' => 'Node-1',
         'spaces_before_argument' => ' '
       },
-      'menu_up' => {},
-      'menu_up_hash' => {
-        'Node-1' => 1
+      'structure' => {
+        'menu_child' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'normalized' => 'Section-1_002e1',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Node-1' => 1
+            }
+          }
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'value_in_node'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'value_in_node'}{'menu_child'};
-$result_menus{'value_in_node'}{'menu_child'}{'menu_up'} = 
$result_menus{'value_in_node'};
+$result_menus{'value_in_node'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'value_in_node'}{'structure'}{'menu_child'};
+$result_menus{'value_in_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'value_in_node'};
 
 $result_errors{'value_in_node'} = [];
 
diff --git a/tp/t/results/value/value_node_directions.pl 
b/tp/t/results/value/value_node_directions.pl
index 0d706fa11a..764a3a8a86 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -151,7 +151,8 @@ $result_trees{'value_node_directions'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -304,7 +305,8 @@ $result_trees{'value_node_directions'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -437,7 +439,8 @@ $result_trees{'value_node_directions'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -580,7 +583,8 @@ $result_sectioning{'value_node_directions'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -595,7 +599,8 @@ $result_sectioning{'value_node_directions'} = {
                   'extra' => {
                     'normalized' => 'bar',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -615,7 +620,8 @@ $result_sectioning{'value_node_directions'} = {
                   'extra' => {
                     'normalized' => 'BarFoo',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -659,22 +665,7 @@ $result_nodes{'value_node_directions'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'bar',
-      'spaces_before_argument' => ' '
-    },
+  'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
@@ -685,24 +676,63 @@ $result_nodes{'value_node_directions'} = {
           },
           'structure' => {
             'level' => 1,
-            'number' => 2
+            'number' => 1
           }
         },
-        'normalized' => 'BarFoo',
+        'normalized' => 'bar',
         'spaces_before_argument' => ' '
       },
-      'node_prev' => {},
-      'node_up' => {
-        'extra' => {
-          'manual_content' => [
-            {
-              'text' => 'dir'
+      'structure' => {
+        'node_next' => {
+          'cmdname' => 'node',
+          'extra' => {
+            'associated_section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'structure' => {
+                'level' => 1,
+                'number' => 2
+              }
+            },
+            'normalized' => 'BarFoo',
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'node_prev' => {},
+            'node_up' => {
+              'extra' => {
+                'manual_content' => [
+                  {
+                    'text' => 'dir'
+                  }
+                ]
+              }
             }
-          ]
+          }
+        },
+        'node_prev' => {},
+        'node_up' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'dir'
+              }
+            ]
+          }
         }
       }
     },
-    'node_prev' => {},
+    'node_prev' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'dir'
+          }
+        ]
+      }
+    },
     'node_up' => {
       'extra' => {
         'manual_content' => [
@@ -712,35 +742,18 @@ $result_nodes{'value_node_directions'} = {
         ]
       }
     }
-  },
-  'node_prev' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
-    }
-  },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'dir'
-        }
-      ]
-    }
   }
 };
-$result_nodes{'value_node_directions'}{'node_next'}{'node_next'}{'node_prev'} 
= $result_nodes{'value_node_directions'}{'node_next'};
-$result_nodes{'value_node_directions'}{'node_next'}{'node_prev'} = 
$result_nodes{'value_node_directions'};
+$result_nodes{'value_node_directions'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'value_node_directions'}{'structure'}{'node_next'};
+$result_nodes{'value_node_directions'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'value_node_directions'};
 
 $result_menus{'value_node_directions'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'value_node_directions'} = [];
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index de2b615c22..3aaa3a6e51 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1829,7 +1829,8 @@ $result_trees{'commands_and_spaces'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -2209,31 +2210,33 @@ $result_nodes{'commands_and_spaces'} = {
     'normalized' => 'a',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'b'
-        }
-      ]
-    }
-  },
-  'node_prev' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'c'
-        }
-      ]
-    }
-  },
-  'node_up' => {
-    'extra' => {
-      'manual_content' => [
-        {
-          'text' => 'd'
-        }
-      ]
+  'structure' => {
+    'node_next' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'b'
+          }
+        ]
+      }
+    },
+    'node_prev' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'c'
+          }
+        ]
+      }
+    },
+    'node_up' => {
+      'extra' => {
+        'manual_content' => [
+          {
+            'text' => 'd'
+          }
+        ]
+      }
     }
   }
 };
@@ -2243,7 +2246,8 @@ $result_menus{'commands_and_spaces'} = {
   'extra' => {
     'normalized' => 'a',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'commands_and_spaces'} = [
diff --git a/tp/t/results/xml_tests/image_inline_or_not.pl 
b/tp/t/results/xml_tests/image_inline_or_not.pl
index b90924292e..40c7d7e753 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -134,7 +134,8 @@ $result_trees{'image_inline_or_not'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1177,7 +1178,8 @@ $result_trees{'image_inline_or_not'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1972,7 +1974,8 @@ $result_sectioning{'image_inline_or_not'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1987,7 +1990,8 @@ $result_sectioning{'image_inline_or_not'} = {
                   'extra' => {
                     'normalized' => 'node_005fimage',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -2026,25 +2030,6 @@ $result_nodes{'image_inline_or_not'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
-      },
-      'normalized' => 'node_005fimage',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
-  },
   'menus' => [
     {
       'cmdname' => 'menu',
@@ -2060,11 +2045,34 @@ $result_nodes{'image_inline_or_not'} = {
       }
     }
   ],
-  'node_next' => {}
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
+        },
+        'normalized' => 'node_005fimage',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    },
+    'node_next' => {}
+  }
 };
-$result_nodes{'image_inline_or_not'}{'menu_child'}{'node_prev'} = 
$result_nodes{'image_inline_or_not'};
-$result_nodes{'image_inline_or_not'}{'menu_child'}{'node_up'} = 
$result_nodes{'image_inline_or_not'};
-$result_nodes{'image_inline_or_not'}{'node_next'} = 
$result_nodes{'image_inline_or_not'}{'menu_child'};
+$result_nodes{'image_inline_or_not'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
 = $result_nodes{'image_inline_or_not'};
+$result_nodes{'image_inline_or_not'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
 = $result_nodes{'image_inline_or_not'};
+$result_nodes{'image_inline_or_not'}{'structure'}{'node_next'} = 
$result_nodes{'image_inline_or_not'}{'structure'}{'menu_child'};
 
 $result_menus{'image_inline_or_not'} = {
   'cmdname' => 'node',
@@ -2072,29 +2080,33 @@ $result_menus{'image_inline_or_not'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'menu_child' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'normalized' => 'node_005fimage',
-      'spaces_before_argument' => ' '
-    },
-    'menu_next' => {
+  'structure' => {
+    'menu_child' => {
+      'cmdname' => 'node',
       'extra' => {
-        'manual_content' => [
-          {
-            'text' => 'somewhere'
+        'normalized' => 'node_005fimage',
+        'spaces_before_argument' => ' '
+      },
+      'structure' => {
+        'menu_next' => {
+          'extra' => {
+            'manual_content' => [
+              {
+                'text' => 'somewhere'
+              }
+            ],
+            'normalized' => 'extnode'
           }
-        ],
-        'normalized' => 'extnode'
+        },
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       }
-    },
-    'menu_up' => {},
-    'menu_up_hash' => {
-      'Top' => 1
     }
   }
 };
-$result_menus{'image_inline_or_not'}{'menu_child'}{'menu_up'} = 
$result_menus{'image_inline_or_not'};
+$result_menus{'image_inline_or_not'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'image_inline_or_not'};
 
 $result_errors{'image_inline_or_not'} = [];
 
diff --git a/tp/t/results/xml_tests/node_and_bye.pl 
b/tp/t/results/xml_tests/node_and_bye.pl
index ad660b30a0..697073fb2d 100644
--- a/tp/t/results/xml_tests/node_and_bye.pl
+++ b/tp/t/results/xml_tests/node_and_bye.pl
@@ -59,7 +59,8 @@ $result_trees{'node_and_bye'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'parent' => {}
+        'parent' => {},
+        'structure' => {}
       },
       {
         'args' => [
@@ -103,7 +104,8 @@ $result_nodes{'node_and_bye'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'node_and_bye'} = {
@@ -111,7 +113,8 @@ $result_menus{'node_and_bye'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_and_bye'} = [];
diff --git a/tp/t/results/xml_tests/node_no_section.pl 
b/tp/t/results/xml_tests/node_no_section.pl
index ce275b7854..a64f33c0af 100644
--- a/tp/t/results/xml_tests/node_no_section.pl
+++ b/tp/t/results/xml_tests/node_no_section.pl
@@ -51,7 +51,8 @@ $result_trees{'node_no_section'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     }
   ],
   'type' => 'document_root'
@@ -74,7 +75,8 @@ $result_nodes{'node_no_section'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'node_no_section'} = {
@@ -82,7 +84,8 @@ $result_menus{'node_no_section'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'node_no_section'} = [];
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 0821e2f994..bd97845cc7 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -51,7 +51,8 @@ $result_trees{'block_commands_in_table'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -1645,7 +1646,8 @@ $result_sectioning{'block_commands_in_table'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -1673,7 +1675,8 @@ $result_nodes{'block_commands_in_table'} = {
     },
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_menus{'block_commands_in_table'} = {
@@ -1681,7 +1684,8 @@ $result_menus{'block_commands_in_table'} = {
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'block_commands_in_table'} = [];
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl 
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index d12bb37e76..c05206596a 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -87,7 +87,8 @@ $result_trees{'inter_item_commands_in_table'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -167,7 +168,8 @@ $result_trees{'inter_item_commands_in_table'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'parent' => {}
+      'parent' => {},
+      'structure' => {}
     },
     {
       'args' => [
@@ -3042,7 +3044,8 @@ $result_sectioning{'inter_item_commands_in_table'} = {
             'extra' => {
               'normalized' => 'Top',
               'spaces_before_argument' => ' '
-            }
+            },
+            'structure' => {}
           },
           'spaces_before_argument' => ' '
         },
@@ -3057,7 +3060,8 @@ $result_sectioning{'inter_item_commands_in_table'} = {
                   'extra' => {
                     'normalized' => 'chapter',
                     'spaces_before_argument' => ' '
-                  }
+                  },
+                  'structure' => {}
                 },
                 'spaces_before_argument' => ' '
               },
@@ -3096,35 +3100,40 @@ $result_nodes{'inter_item_commands_in_table'} = {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
   },
-  'node_next' => {
-    'cmdname' => 'node',
-    'extra' => {
-      'associated_section' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
+  'structure' => {
+    'node_next' => {
+      'cmdname' => 'node',
+      'extra' => {
+        'associated_section' => {
+          'cmdname' => 'chapter',
+          'extra' => {
+            'spaces_before_argument' => ' '
+          },
+          'structure' => {
+            'level' => 1,
+            'number' => 1
+          }
         },
-        'structure' => {
-          'level' => 1,
-          'number' => 1
-        }
+        'normalized' => 'chapter',
+        'spaces_before_argument' => ' '
       },
-      'normalized' => 'chapter',
-      'spaces_before_argument' => ' '
-    },
-    'node_prev' => {},
-    'node_up' => {}
+      'structure' => {
+        'node_prev' => {},
+        'node_up' => {}
+      }
+    }
   }
 };
-$result_nodes{'inter_item_commands_in_table'}{'node_next'}{'node_prev'} = 
$result_nodes{'inter_item_commands_in_table'};
-$result_nodes{'inter_item_commands_in_table'}{'node_next'}{'node_up'} = 
$result_nodes{'inter_item_commands_in_table'};
+$result_nodes{'inter_item_commands_in_table'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 = $result_nodes{'inter_item_commands_in_table'};
+$result_nodes{'inter_item_commands_in_table'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 = $result_nodes{'inter_item_commands_in_table'};
 
 $result_menus{'inter_item_commands_in_table'} = {
   'cmdname' => 'node',
   'extra' => {
     'normalized' => 'Top',
     'spaces_before_argument' => ' '
-  }
+  },
+  'structure' => {}
 };
 
 $result_errors{'inter_item_commands_in_table'} = [];



reply via email to

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